Changeset 9209

Timestamp:

09/08/08 11:00:01 (2 months ago)

Author:

hannes

Message:

Merge branch 'earl-skins'

Files:

• helma-ng/trunk/apps/demo/skins/continuation.html (modified) (1 diff)
• helma-ng/trunk/apps/storage/skins/index.html (modified) (1 diff)
• helma-ng/trunk/modules/helma/filters.js (modified) (1 diff)
• helma-ng/trunk/modules/helma/skin.js (modified) (1 diff)

helma-ng/trunk/apps/demo/skins/continuation.html

@@ -58 +58 @@
-
-<% subskin 'step3' ---------------------------------------------------------------------- %>
-prefix="&raquo;" suffix="&l
+| wrap "&laquo;" "&r
-
-<p><a href="http://dev.helma.org/ng/helma.continuation">Learn more about continuations</a> in Helma NG</p>

helma-ng/trunk/apps/storage/skins/index.html

@@ -3 +3 @@
-<% subskin 'content' %>
-<h1><% title %></h1>
-prefix="<p>" suffix=
+| prefix "<p>" | suffix 
-
-<h3>Add a new book</h3>

helma-ng/trunk/modules/helma/filters.js

@@ -207 +207 @@
-   }
-}
+
+(function() {
+    var isVisible = function(str) {
+        return str !== undefined && str != null && str != '';
+    }
+
+    /**
+     * Returns a default string if the given string was empty, undefined
+     * or null.
+     */
+    this.default_filter = function(input, filter) {
+        return isVisible(input) ?
+                input :
+                filter.getParameter(0);
+    }
+
+    /**
+     * Prepends a prefix if the given string is not empty, undefined or null.
+     */
+    this.prefix_filter = function(input, filter) {
+        return isVisible(input) ?
+                (filter.getParameter(0) || '') + input :
+                input;
+    }
+
+    /**
+     * Appends a suffix if the given string is not empty, undefined or null.
+     */
+    this.suffix_filter = function(input, filter) {
+        return isVisible(input) ?
+                input + (filter.getParameter(0) || '') :
+                input;
+    }
+
+    /**
+     * Wraps a non-empty string with a prefix and suffix string.
+     */
+    this.wrap_filter = function(input, filter) {
+        return isVisible(input) ?
+                (filter.getParameter(0) || '')
+                        + input
+                        + (filter.getParameter(1) || '') :
+                input;
+    }
+})();

helma-ng/trunk/modules/helma/skin.js

@@ -153 +153 @@
-            filter = filter.filter;
-        }
-
-
-
-
-
-
-
-
+
+
-        }
-    };