You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shindig.apache.org by vs...@apache.org on 2009/04/03 23:01:28 UTC

svn commit: r761791 - in /incubator/shindig/trunk/features/src: main/javascript/features/opensocial-templates/ main/javascript/features/opensocial-templates/jsTemplate/ test/javascript/features/opensocial-templates/

Author: vsiveton
Date: Fri Apr  3 21:01:28 2009
New Revision: 761791

URL: http://svn.apache.org/viewvc?rev=761791&view=rev
Log:
SHINDIG-1007: Conditional tags supoprt, var precedence, moving JST branch into Shindig codebase
Submitted by: Lev Epshteyn

o patch applied

Added:
    incubator/shindig/trunk/features/src/main/javascript/features/opensocial-templates/jsTemplate/
    incubator/shindig/trunk/features/src/main/javascript/features/opensocial-templates/jsTemplate/jsevalcontext.js   (with props)
    incubator/shindig/trunk/features/src/main/javascript/features/opensocial-templates/jsTemplate/jstemplate.js   (with props)
    incubator/shindig/trunk/features/src/main/javascript/features/opensocial-templates/jsTemplate/util.js   (with props)
Modified:
    incubator/shindig/trunk/features/src/main/javascript/features/opensocial-templates/base.js
    incubator/shindig/trunk/features/src/main/javascript/features/opensocial-templates/compiler.js
    incubator/shindig/trunk/features/src/main/javascript/features/opensocial-templates/feature.xml
    incubator/shindig/trunk/features/src/test/javascript/features/opensocial-templates/index.html
    incubator/shindig/trunk/features/src/test/javascript/features/opensocial-templates/template_test.js

Modified: incubator/shindig/trunk/features/src/main/javascript/features/opensocial-templates/base.js
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/features/src/main/javascript/features/opensocial-templates/base.js?rev=761791&r1=761790&r2=761791&view=diff
==============================================================================
--- incubator/shindig/trunk/features/src/main/javascript/features/opensocial-templates/base.js (original)
+++ incubator/shindig/trunk/features/src/main/javascript/features/opensocial-templates/base.js Fri Apr  3 21:01:28 2009
@@ -171,6 +171,35 @@
   };
 };
 
+os.computeChildMap_ = function(node) {
+  var map = {};
+  for (var i = 0; i < node.childNodes.length; i++) {
+    var child = node.childNodes[i];
+    if (!child.tagName) {
+      continue;
+    }
+    var name = child.getAttribute(os.ATT_customtag);    
+    if (name) {
+      var parts = name.split(":");
+      parts.length == 2 ? name = parts[1] : name = parts[0];
+    } else {
+      name = child.tagName;
+    }
+    name = name.toLowerCase();
+    var prev = map[name];
+    if (!prev) {
+      map[name] = child;
+    } else if (os.isArray(prev)) {
+      prev.push(child);
+    } else {
+      map[name] = [];
+      map[name].push(prev);
+      map[name].push(child);
+    }
+  }
+  return map;
+};
+
 /**
  * Creates a functor which returns a value from the specified node given a
  * name.
@@ -268,8 +297,15 @@
       os.markNodeToSkip(child);
     }
   }
+  
+  var ctx = context;
+  var selectInner = node[PROP_jstcache] ? node[PROP_jstcache][ATT_innerselect] : null;
+  if (selectInner) {
+    var data = context.jsexec(selectInner, node);
+    ctx = context.clone(data, 0, 0);
+  }
 
-  var result = tagFunction.call(null, node, data, context);
+  var result = tagFunction.call(null, node, data, ctx);
 
   if (!result && typeof(result) != "string") {
     throw "Custom tag <" + ns + ":" + tag + "> failed to return anything.";

Modified: incubator/shindig/trunk/features/src/main/javascript/features/opensocial-templates/compiler.js
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/features/src/main/javascript/features/opensocial-templates/compiler.js?rev=761791&r1=761790&r2=761791&view=diff
==============================================================================
--- incubator/shindig/trunk/features/src/main/javascript/features/opensocial-templates/compiler.js (original)
+++ incubator/shindig/trunk/features/src/main/javascript/features/opensocial-templates/compiler.js Fri Apr  3 21:01:28 2009
@@ -232,6 +232,12 @@
     if (typeof(ret) == "undefined") {
       ret = os.identifierResolver_(context.vars_, name);
     }
+    if (typeof(ret) == "undefined" && context.vars_[os.VAR_my]) {
+      ret = os.getValueFromNode_(context.vars_[os.VAR_my], name);
+    }
+    if (typeof(ret) == "undefined" && context.vars_[VAR_top]) {
+      ret = context.vars_[VAR_top][name];
+    }
   } else if (context.nodeType == DOM_ELEMENT_NODE) {
     // Is the context a DOM node?
     ret = os.getValueFromNode_(context, name);
@@ -269,9 +275,9 @@
  * used to implement that feature.
  */
 os.attributeMap_ = {
-  'if': 'jsdisplay',
-  'repeat': 'jsselect',
-  'context': 'jsselect'
+  'if': ATT_display,
+  'repeat': ATT_select,
+  'cur': ATT_innerselect
 };
 
 /**
@@ -347,6 +353,10 @@
             // to create a function to set as a property.
             outName = '.' + outName;
             substitution = 'new Function(' + substitution + ')';
+          } else if (outName == 'selected' && to.tagName == 'OPTION') {
+            // For the @selected attribute of an option, set the property 
+            // instead to allow false values to not mark the option selected.
+            outName = '.selected'
           }
 
           // TODO: reuse static array (IE6 perf).
@@ -406,24 +416,33 @@
   } else if (node.nodeType == DOM_ELEMENT_NODE) {
     var output;
     if (node.tagName.indexOf(":") > 0) {
-      output = document.createElement("span");
-      output.setAttribute(os.ATT_customtag, node.tagName);
+      if (node.tagName == "os:Repeat") {
+        output = document.createElement(os.computeContainerTag_(node));
+        output.setAttribute(ATT_select, os.parseAttribute_(node.getAttribute("expression")));
+        os.appendJSTAttribute_(output, ATT_eval, "os.setContextNode_($this, $context)");
+      } else if (node.tagName == "os:If") {
+        output = document.createElement(os.computeContainerTag_(node));
+        output.setAttribute(ATT_display, os.parseAttribute_(node.getAttribute("condition")));
+      } else {
+        output = document.createElement("span");
+        output.setAttribute(os.ATT_customtag, node.tagName);
 
-      var custom = node.tagName.split(":");
-      os.appendJSTAttribute_(output, ATT_eval, "os.doTag(this, \""
-          + custom[0] + "\", \"" + custom[1] + "\", $this, $context)");
-      var context = node.getAttribute("context") || "$this||true";
-      output.setAttribute(ATT_select, context);
-
-      // For os:Render, create a parent node reference.
-      // TODO: remove legacy support
-      if (node.tagName == "os:render" || node.tagName == "os:Render" ||
-          node.tagName == "os:renderAll" || node.tagName == "os:RenderAll") {
-        os.appendJSTAttribute_(output, ATT_values, os.VAR_parentnode + ":" +
-            os.VAR_node);
-      }
+        var custom = node.tagName.split(":");
+        os.appendJSTAttribute_(output, ATT_eval, "os.doTag(this, \""
+            + custom[0] + "\", \"" + custom[1] + "\", $this, $context)");
+        var context = node.getAttribute("cur") || "{}";
+        output.setAttribute(ATT_innerselect, context);
+
+        // For os:Render, create a parent node reference.
+        // TODO: remove legacy support
+        if (node.tagName == "os:render" || node.tagName == "os:Render" ||
+            node.tagName == "os:renderAll" || node.tagName == "os:RenderAll") {
+          os.appendJSTAttribute_(output, ATT_values, os.VAR_parentnode + ":" +
+              os.VAR_node);
+        }
 
-      os.copyAttributes_(node, output, node.tagName);
+        os.copyAttributes_(node, output, node.tagName);
+      }
     } else {
       output = os.xmlToHtml_(node);
     }
@@ -461,6 +480,35 @@
 };
 
 /**
+ * Calculates the type of element best suited to encapsulating contents of a 
+ * <os:Repeat> or <os:If> tags. Inspects the element's children to see if one 
+ * of the special cases should be used.
+ * "optgroup" for <option>s
+ * "tbody" for <tr>s
+ * "span" otherwise
+ * @param {Element} element The repeater/conditional element
+ * @return {stirng} Name of the node ot represent this repeater.
+ */
+os.computeContainerTag_ = function(element) {
+  var child = element.firstChild;
+  if (child) {
+    while (child && !child.tagName) {
+      child = child.nextSibling;
+    }
+    if (child) {
+      var tag = child.tagName.toLowerCase();
+      if (tag == "option") {
+        return "optgroup";
+      }
+      if (tag == "tr") {
+        return "tbody";
+      }
+    }
+  }
+  return "span";
+};
+
+/**
  * XHTML Entities we need to support in XML, defined in DOCTYPE format.
  *
  * TODO(levik): A better way to do this.
@@ -655,59 +703,41 @@
  * Object, Element or array of Elements.
  */
 os.getValueFromNode_ = function(node, name) {
-  var ret = (name != "*") ? node[name] : null;
-  if (name != "*" && (typeof(ret) == "undefined" || ret == null)) {
-    ret = node.getAttribute(name);
-  }
 
-  if (typeof(ret) == "undefined" || ret == null) {
-    if (name) {
-      name = name.toLowerCase();
-    }
-
-    // A special character meaning "get all child nodes".
-    var allChildren = ("*" == name);
-
-    ret = [];
+  if (name == "*") {
+    var children = [];
     for (var child = node.firstChild; child; child = child.nextSibling) {
-      if (allChildren) {
-        ret.push(child);
-        continue;
-      }
-      if (child.nodeType != DOM_ELEMENT_NODE) {
-        continue;
-      }
-      var tagName = child.getAttribute(os.ATT_customtag);
-      if (!tagName) {
-        tagName = child.tagName;
-      }
-      tagName = tagName.toLowerCase();
-      if (tagName == name) {
-        ret.push(child);
-      }
+      children.push(child);
     }
-    if (ret.length == 0) {
-      ret = null;
-    }
-
-    // Check for "optimized" dynamic content. A tag like:
-    // <div>${a}</div> would have compiled to <div jscontent="a"/>, and we
-    // need to reconstruct its content here into a span.
-    var content;
-    if (ret == null && allChildren &&
-        (content = node.getAttribute(ATT_content))) {
-      var span = document.createElement("span");
-      span.setAttribute(ATT_content, content);
-      ret = [ span ];
+    return children;
+  }
+  
+  // Since namespaces are not supported, strip off prefix.
+  if (name.indexOf(':') >= 0) {
+    name = name.substring(name.indexOf(':') + 1);
+  }
+  
+  var ret = node[name];
+  if (typeof(ret) == "undefined" || ret == null) {
+    ret = node.getAttribute(name);
+  }
+  
+  if (typeof(ret) != "undefined" && ret != null) {
+    // Process special cases where ret would be wrongly evaluated as "true"
+    if (ret == "false") {
+      ret = false;
+    } else if (ret == "0") {
+      ret = 0;
     }
+    return ret;
   }
 
-  // Process special cases where ret would be wrongly evaluated as "true"
-  if (ret == "false") {
-    ret = false;
-  } else if (ret == "0") {
-    ret = 0;
+  var myMap = node[os.VAR_my];
+  if (!myMap) {
+    myMap = os.computeChildMap_(node);
+    node[os.VAR_my] = myMap;
   }
+  ret = myMap[name.toLowerCase()];
   return ret;
 };
 

Modified: incubator/shindig/trunk/features/src/main/javascript/features/opensocial-templates/feature.xml
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/features/src/main/javascript/features/opensocial-templates/feature.xml?rev=761791&r1=761790&r2=761791&view=diff
==============================================================================
--- incubator/shindig/trunk/features/src/main/javascript/features/opensocial-templates/feature.xml (original)
+++ incubator/shindig/trunk/features/src/main/javascript/features/opensocial-templates/feature.xml Fri Apr  3 21:01:28 2009
@@ -34,9 +34,9 @@
   <dependency>opensocial-0.8</dependency>
   <dependency>xmlutil</dependency>
   <gadget>
-    <script src="http://google-jstemplate.googlecode.com/svn/trunk/util.js"></script>
-    <script src="http://google-jstemplate.googlecode.com/svn/trunk/jsevalcontext.js"></script>
-    <script src="http://google-jstemplate.googlecode.com/svn/trunk/jstemplate.js"></script>
+    <script src="jsTemplate/util.js"></script>
+    <script src="jsTemplate/jsevalcontext.js"></script>
+    <script src="jsTemplate/jstemplate.js"></script>
     <script src="jstemplate_debug.js"></script>
     <script src="base.js"></script>
     <script src="namespaces.js"></script>

Added: incubator/shindig/trunk/features/src/main/javascript/features/opensocial-templates/jsTemplate/jsevalcontext.js
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/features/src/main/javascript/features/opensocial-templates/jsTemplate/jsevalcontext.js?rev=761791&view=auto
==============================================================================
--- incubator/shindig/trunk/features/src/main/javascript/features/opensocial-templates/jsTemplate/jsevalcontext.js (added)
+++ incubator/shindig/trunk/features/src/main/javascript/features/opensocial-templates/jsTemplate/jsevalcontext.js Fri Apr  3 21:01:28 2009
@@ -0,0 +1,414 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ */
+
+/**
+ * Author: Steffen Meschkat <me...@google.com>
+ *
+ * @fileoverview This class is used to evaluate expressions in a local
+ * context. Used by JstProcessor.
+ */
+
+
+/**
+ * Names of special variables defined by the jstemplate evaluation
+ * context. These can be used in js expression in jstemplate
+ * attributes.
+ */
+var VAR_index = '$index';
+var VAR_count = '$count';
+var VAR_this = '$this';
+var VAR_context = '$context';
+var VAR_top = '$top';
+
+
+/**
+ * The name of the global variable which holds the value to be returned if
+ * context evaluation results in an error. 
+ * Use JsEvalContext.setGlobal(GLOB_default, value) to set this.
+ */
+var GLOB_default = '$default';
+
+
+/**
+ * Un-inlined literals, to avoid object creation in IE6. TODO:
+ * So far, these are only used here, but we could use them thoughout
+ * the code and thus move them to constants.js.
+ */
+var CHAR_colon = ':';
+var REGEXP_semicolon = /\s*;\s*/;
+
+
+/**
+ * See constructor_()
+ * @param {Object|null} opt_data
+ * @param {Object} opt_parent
+ * @constructor
+ */
+function JsEvalContext(opt_data, opt_parent) {
+  this.constructor_.apply(this, arguments);
+}
+
+/**
+ * Context for processing a jstemplate. The context contains a context
+ * object, whose properties can be referred to in jstemplate
+ * expressions, and it holds the locally defined variables.
+ *
+ * @param {Object|null} opt_data The context object. Null if no context.
+ *
+ * @param {Object} opt_parent The parent context, from which local
+ * variables are inherited. Normally the context object of the parent
+ * context is the object whose property the parent object is. Null for the
+ * context of the root object.
+ */
+JsEvalContext.prototype.constructor_ = function(opt_data, opt_parent) {
+  var me = this;
+
+  /**
+   * The context for variable definitions in which the jstemplate
+   * expressions are evaluated. Other than for the local context,
+   * which replaces the parent context, variable definitions of the
+   * parent are inherited. The special variable $this points to data_.
+   *
+   * If this instance is recycled from the cache, then the property is
+   * already initialized.
+   *
+   * @type {Object}
+   */
+  if (!me.vars_) {
+    me.vars_ = {};
+  }
+  if (opt_parent) {
+    // If there is a parent node, inherit local variables from the
+    // parent.
+    copyProperties(me.vars_, opt_parent.vars_);
+  } else {
+    // If a root node, inherit global symbols. Since every parent
+    // chain has a root with no parent, global variables will be
+    // present in the case above too. This means that globals can be
+    // overridden by locals, as it should be.
+    copyProperties(me.vars_, JsEvalContext.globals_);
+  }
+
+  /**
+   * The current context object is assigned to the special variable
+   * $this so it is possible to use it in expressions.
+   * @type Object
+   */
+  me.vars_[VAR_this] = opt_data;
+
+  /**
+   * The entire context structure is exposed as a variable so it can be
+   * passed to javascript invocations through jseval.
+   */
+  me.vars_[VAR_context] = me;
+
+  /**
+   * The local context of the input data in which the jstemplate
+   * expressions are evaluated. Notice that this is usually an Object,
+   * but it can also be a scalar value (and then still the expression
+   * $this can be used to refer to it). Notice this can even be value,
+   * undefined or null. Hence, we have to protect jsexec() from using
+   * undefined or null, yet we want $this to reflect the true value of
+   * the current context. Thus we assign the original value to $this,
+   * above, but for the expression context we replace null and
+   * undefined by the empty string.
+   *
+   * @type {Object|null}
+   */
+  me.data_ = getDefaultObject(opt_data, STRING_empty);
+
+  if (!opt_parent) {
+    // If this is a top-level context, create a variable reference to the data
+    // to allow for  accessing top-level properties of the original context
+    // data from child contexts.
+    me.vars_[VAR_top] = me.data_;
+  }
+};
+
+
+/**
+ * A map of globally defined symbols. Every instance of JsExprContext
+ * inherits them in its vars_.
+ * @type Object
+ */
+JsEvalContext.globals_ = {}
+
+
+/**
+ * Sets a global symbol. It will be available like a variable in every
+ * JsEvalContext instance. This is intended mainly to register
+ * immutable global objects, such as functions, at load time, and not
+ * to add global data at runtime. I.e. the same objections as to
+ * global variables in general apply also here. (Hence the name
+ * "global", and not "global var".)
+ * @param {string} name
+ * @param {Object|null} value
+ */
+JsEvalContext.setGlobal = function(name, value) {
+  JsEvalContext.globals_[name] = value;
+};
+
+
+/**
+ * Set the default value to be returned if context evaluation results in an 
+ * error. (This can occur if a non-existent value was requested). 
+ */
+JsEvalContext.setGlobal(GLOB_default, null);
+
+
+/**
+ * A cache to reuse JsEvalContext instances. (IE6 perf)
+ *
+ * @type Array.<JsEvalContext>
+ */
+JsEvalContext.recycledInstances_ = [];
+
+
+/**
+ * A factory to create a JsEvalContext instance, possibly reusing
+ * one from recycledInstances_. (IE6 perf)
+ *
+ * @param {Object} opt_data
+ * @param {JsEvalContext} opt_parent
+ * @return {JsEvalContext}
+ */
+JsEvalContext.create = function(opt_data, opt_parent) {
+  if (jsLength(JsEvalContext.recycledInstances_) > 0) {
+    var instance = JsEvalContext.recycledInstances_.pop();
+    JsEvalContext.call(instance, opt_data, opt_parent);
+    return instance;
+  } else {
+    return new JsEvalContext(opt_data, opt_parent);
+  }
+};
+
+
+/**
+ * Recycle a used JsEvalContext instance, so we can avoid creating one
+ * the next time we need one. (IE6 perf)
+ *
+ * @param {JsEvalContext} instance
+ */
+JsEvalContext.recycle = function(instance) {
+  for (var i in instance.vars_) {
+    // NOTE: We avoid object creation here. (IE6 perf)
+    delete instance.vars_[i];
+  }
+  instance.data_ = null;
+  JsEvalContext.recycledInstances_.push(instance);
+};
+
+
+/**
+ * Executes a function created using jsEvalToFunction() in the context
+ * of vars, data, and template.
+ *
+ * @param {Function} exprFunction A javascript function created from
+ * a jstemplate attribute value.
+ *
+ * @param {Element} template DOM node of the template.
+ *
+ * @return {Object|null} The value of the expression from which
+ * exprFunction was created in the current js expression context and
+ * the context of template.
+ */
+JsEvalContext.prototype.jsexec = function(exprFunction, template) {
+  try {
+    return exprFunction.call(template, this.vars_, this.data_);
+  } catch (e) {
+    log('jsexec EXCEPTION: ' + e + ' at ' + template +
+        ' with ' + exprFunction);
+    return JsEvalContext.globals_[GLOB_default];
+  }
+};
+
+
+/**
+ * Clones the current context for a new context object. The cloned
+ * context has the data object as its context object and the current
+ * context as its parent context. It also sets the $index variable to
+ * the given value. This value usually is the position of the data
+ * object in a list for which a template is instantiated multiply.
+ *
+ * @param {Object} data The new context object.
+ *
+ * @param {number} index Position of the new context when multiply
+ * instantiated. (See implementation of jstSelect().)
+ * 
+ * @param {number} count The total number of contexts that were multiply
+ * instantiated. (See implementation of jstSelect().)
+ *
+ * @return {JsEvalContext}
+ */
+JsEvalContext.prototype.clone = function(data, index, count) {
+  var ret = JsEvalContext.create(data, this);
+  ret.setVariable(VAR_index, index);
+  ret.setVariable(VAR_count, count);
+  return ret;
+};
+
+
+/**
+ * Binds a local variable to the given value. If set from jstemplate
+ * jsvalue expressions, variable names must start with $, but in the
+ * API they only have to be valid javascript identifier.
+ *
+ * @param {string} name
+ *
+ * @param {Object?} value
+ */
+JsEvalContext.prototype.setVariable = function(name, value) {
+  this.vars_[name] = value;
+};
+
+
+/**
+ * Returns the value bound to the local variable of the given name, or
+ * undefined if it wasn't set. There is no way to distinguish a
+ * variable that wasn't set from a variable that was set to
+ * undefined. Used mostly for testing.
+ *
+ * @param {string} name
+ *
+ * @return {Object?} value
+ */
+JsEvalContext.prototype.getVariable = function(name) {
+  return this.vars_[name];
+};
+
+
+/**
+ * Evaluates a string expression within the scope of this context
+ * and returns the result.
+ *
+ * @param {string} expr A javascript expression
+ * @param {Element} opt_template An optional node to serve as "this"
+ *
+ * @return {Object?} value
+ */
+JsEvalContext.prototype.evalExpression = function(expr, opt_template) {
+  var exprFunction = jsEvalToFunction(expr);
+  return this.jsexec(exprFunction, opt_template);
+};
+
+
+/**
+ * Uninlined string literals for jsEvalToFunction() (IE6 perf).
+ */
+var STRING_a = 'a_';
+var STRING_b = 'b_';
+var STRING_with = 'with (a_) with (b_) return ';
+
+
+/**
+ * Cache for jsEvalToFunction results.
+ * @type Object
+ */
+JsEvalContext.evalToFunctionCache_ = {};
+
+
+/**
+ * Evaluates the given expression as the body of a function that takes
+ * vars and data as arguments. Since the resulting function depends
+ * only on expr, we cache the result so we save some Function
+ * invocations, and some object creations in IE6.
+ *
+ * @param {string} expr A javascript expression.
+ *
+ * @return {Function} A function that returns the value of expr in the
+ * context of vars and data.
+ */
+function jsEvalToFunction(expr) {
+  if (!JsEvalContext.evalToFunctionCache_[expr]) {
+    try {
+      // NOTE: The Function constructor is faster than eval().
+      JsEvalContext.evalToFunctionCache_[expr] =
+        new Function(STRING_a, STRING_b, STRING_with + expr);
+    } catch (e) {
+      log('jsEvalToFunction (' + expr + ') EXCEPTION ' + e);
+    }
+  }
+  return JsEvalContext.evalToFunctionCache_[expr];
+}
+
+
+/**
+ * Evaluates the given expression to itself. This is meant to pass
+ * through string attribute values.
+ *
+ * @param {string} expr
+ *
+ * @return {string}
+ */
+function jsEvalToSelf(expr) {
+  return expr;
+}
+
+
+/**
+ * Parses the value of the jsvalues attribute in jstemplates: splits
+ * it up into a map of labels and expressions, and creates functions
+ * from the expressions that are suitable for execution by
+ * JsEvalContext.jsexec(). All that is returned as a flattened array
+ * of pairs of a String and a Function.
+ *
+ * @param {string} expr
+ *
+ * @return {Array}
+ */
+function jsEvalToValues(expr) {
+  // TODO: It is insufficient to split the values by simply
+  // finding semi-colons, as the semi-colon may be part of a string
+  // constant or escaped.
+  var ret = [];
+  var values = expr.split(REGEXP_semicolon);
+  for (var i = 0, I = jsLength(values); i < I; ++i) {
+    var colon = values[i].indexOf(CHAR_colon);
+    if (colon < 0) {
+      continue;
+    }
+    var label = stringTrim(values[i].substr(0, colon));
+    var value = jsEvalToFunction(values[i].substr(colon + 1));
+    ret.push(label, value);
+  }
+  return ret;
+}
+
+
+/**
+ * Parses the value of the jseval attribute of jstemplates: splits it
+ * up into a list of expressions, and creates functions from the
+ * expressions that are suitable for execution by
+ * JsEvalContext.jsexec(). All that is returned as an Array of
+ * Function.
+ *
+ * @param {string} expr
+ *
+ * @return {Array.<Function>}
+ */
+function jsEvalToExpressions(expr) {
+  var ret = [];
+  var values = expr.split(REGEXP_semicolon);
+  for (var i = 0, I = jsLength(values); i < I; ++i) {
+    if (values[i]) {
+      var value = jsEvalToFunction(values[i]);
+      ret.push(value);
+    }
+  }
+  return ret;
+}

Propchange: incubator/shindig/trunk/features/src/main/javascript/features/opensocial-templates/jsTemplate/jsevalcontext.js
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/shindig/trunk/features/src/main/javascript/features/opensocial-templates/jsTemplate/jsevalcontext.js
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Added: incubator/shindig/trunk/features/src/main/javascript/features/opensocial-templates/jsTemplate/jstemplate.js
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/features/src/main/javascript/features/opensocial-templates/jsTemplate/jstemplate.js?rev=761791&view=auto
==============================================================================
--- incubator/shindig/trunk/features/src/main/javascript/features/opensocial-templates/jsTemplate/jstemplate.js (added)
+++ incubator/shindig/trunk/features/src/main/javascript/features/opensocial-templates/jsTemplate/jstemplate.js Fri Apr  3 21:01:28 2009
@@ -0,0 +1,1033 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ */
+
+/**
+ * Author: Steffen Meschkat <me...@google.com>
+ *
+ * @fileoverview A simple formatter to project JavaScript data into
+ * HTML templates. The template is edited in place. I.e. in order to
+ * instantiate a template, clone it from the DOM first, and then
+ * process the cloned template. This allows for updating of templates:
+ * If the templates is processed again, changed values are merely
+ * updated.
+ *
+ * NOTE: IE DOM doesn't have importNode().
+ *
+ * NOTE: The property name "length" must not be used in input
+ * data, see comment in jstSelect_().
+ */
+
+
+/**
+ * Names of jstemplate attributes. These attributes are attached to
+ * normal HTML elements and bind expression context data to the HTML
+ * fragment that is used as template.
+ */
+var ATT_select = 'jsselect';
+var ATT_instance = 'jsinstance';
+var ATT_display = 'jsdisplay';
+var ATT_values = 'jsvalues';
+var ATT_vars = 'jsvars';
+var ATT_eval = 'jseval';
+var ATT_transclude = 'transclude';
+var ATT_content = 'jscontent';
+var ATT_skip = 'jsskip';
+var ATT_innerselect = 'jsinnerselect';
+
+
+/**
+ * Name of the attribute that caches a reference to the parsed
+ * template processing attribute values on a template node.
+ */
+var ATT_jstcache = 'jstcache';
+
+
+/**
+ * Name of the property that caches the parsed template processing
+ * attribute values on a template node.
+ */
+var PROP_jstcache = '__jstcache';
+
+
+/**
+ * ID of the element that contains dynamically loaded jstemplates.
+ */
+var STRING_jsts = 'jsts';
+
+
+/**
+ * Un-inlined string literals, to avoid object creation in
+ * IE6.
+ */
+var CHAR_asterisk = '*';
+var CHAR_dollar = '$';
+var CHAR_period = '.';
+var CHAR_ampersand = '&';
+var STRING_div = 'div';
+var STRING_id = 'id';
+var STRING_asteriskzero = '*0';
+var STRING_zero = '0';
+
+
+/**
+ * HTML template processor. Data values are bound to HTML templates
+ * using the attributes transclude, jsselect, jsdisplay, jscontent,
+ * jsvalues. The template is modifed in place. The values of those
+ * attributes are JavaScript expressions that are evaluated in the
+ * context of the data object fragment.
+ *
+ * @param {JsEvalContext} context Context created from the input data
+ * object.
+ *
+ * @param {Element} template DOM node of the template. This will be
+ * processed in place. After processing, it will still be a valid
+ * template that, if processed again with the same data, will remain
+ * unchanged.
+ *
+ * @param {boolean} opt_debugging Optional flag to collect debugging
+ *     information while processing the template.  Only takes effect
+ *     in MAPS_DEBUG.
+ */
+function jstProcess(context, template, opt_debugging) {
+  var processor = new JstProcessor;
+  if (MAPS_DEBUG && opt_debugging) {
+    processor.setDebugging(opt_debugging);
+  }
+  JstProcessor.prepareTemplate_(template);
+
+  /**
+   * Caches the document of the template node, so we don't have to
+   * access it through ownerDocument.
+   * @type Document
+   */
+  processor.document_ = ownerDocument(template);
+
+  processor.run_(bindFully(processor, processor.jstProcessOuter_,
+                           context, template));
+  if (MAPS_DEBUG && opt_debugging) {
+    log('jstProcess:' + '\n' + processor.getLogs().join('\n'));
+  }
+}
+
+
+/**
+ * Internal class used by jstemplates to maintain context.  This is
+ * necessary to process deep templates in Safari which has a
+ * relatively shallow maximum recursion depth of 100.
+ * @class
+ * @constructor
+ */
+function JstProcessor() {
+  if (MAPS_DEBUG) {
+    /**
+     * An array of logging messages.  These are collected during processing
+     * and dumped to the console at the end.
+     * @type Array.<string>
+     */
+    this.logs_ = [];
+  }
+}
+
+
+/**
+ * Counter to generate node ids. These ids will be stored in
+ * ATT_jstcache and be used to lookup the preprocessed js attributes
+ * from the jstcache_. The id is stored in an attribute so it
+ * suvives cloneNode() and thus cloned template nodes can share the
+ * same cache entry.
+ * @type number
+ */
+JstProcessor.jstid_ = 0;
+
+
+/**
+ * Map from jstid to processed js attributes.
+ * @type Object
+ */
+JstProcessor.jstcache_ = {};
+
+/**
+ * The neutral cache entry. Used for all nodes that don't have any
+ * jst attributes. We still set the jsid attribute on those nodes so
+ * we can avoid to look again for all the other jst attributes that
+ * aren't there. Remember: not only the processing of the js
+ * attribute values is expensive and we thus want to cache it. The
+ * access to the attributes on the Node in the first place is
+ * expensive too.
+ */
+JstProcessor.jstcache_[0] = {};
+
+
+/**
+ * Map from concatenated attribute string to jstid.
+ * The key is the concatenation of all jst atributes found on a node
+ * formatted as "name1=value1&name2=value2&...", in the order defined by
+ * JST_ATTRIBUTES. The value is the id of the jstcache_ entry that can
+ * be used for this node. This allows the reuse of cache entries in cases
+ * when a cached entry already exists for a given combination of attribute
+ * values. (For example when two different nodes in a template share the same
+ * JST attributes.)
+ * @type Object
+ */
+JstProcessor.jstcacheattributes_ = {};
+
+
+/**
+ * Map for storing temporary attribute values in prepareNode_() so they don't
+ * have to be retrieved twice. (IE6 perf)
+ * @type Object
+ */
+JstProcessor.attributeValues_ = {};
+
+
+/**
+ * A list for storing non-empty attributes found on a node in prepareNode_().
+ * The array is global since it can be reused - this way there is no need to
+ * construct a new array object for each invocation. (IE6 perf)
+ * @type Array
+ */
+JstProcessor.attributeList_ = [];
+
+
+/**
+ * Prepares the template: preprocesses all jstemplate attributes.
+ *
+ * @param {Element} template
+ */
+JstProcessor.prepareTemplate_ = function(template) {
+  if (!template[PROP_jstcache]) {
+    domTraverseElements(template, function(node) {
+      JstProcessor.prepareNode_(node);
+    });
+  }
+};
+
+
+/**
+ * A list of attributes we use to specify jst processing instructions,
+ * and the functions used to parse their values.
+ *
+ * @type Array.<Array>
+ */
+var JST_ATTRIBUTES = [
+    [ ATT_select, jsEvalToFunction ],
+    [ ATT_display, jsEvalToFunction ],
+    [ ATT_values, jsEvalToValues ],
+    [ ATT_vars, jsEvalToValues ],
+    [ ATT_eval, jsEvalToExpressions ],
+    [ ATT_transclude, jsEvalToSelf ],
+    [ ATT_content, jsEvalToFunction ],
+    [ ATT_skip, jsEvalToFunction ],
+    [ ATT_innerselect, jsEvalToFunction ]
+];
+
+
+/**
+ * Prepares a single node: preprocesses all template attributes of the
+ * node, and if there are any, assigns a jsid attribute and stores the
+ * preprocessed attributes under the jsid in the jstcache.
+ *
+ * @param {Element} node
+ *
+ * @return {Object} The jstcache entry. The processed jst attributes
+ * are properties of this object. If the node has no jst attributes,
+ * returns an object with no properties (the jscache_[0] entry).
+ */
+JstProcessor.prepareNode_ = function(node) {
+  // If the node already has a cache property, return it.
+  if (node[PROP_jstcache]) {
+    return node[PROP_jstcache];
+  }
+
+  // If it is not found, we always set the PROP_jstcache property on the node.
+  // Accessing the property is faster than executing getAttribute(). If we
+  // don't find the property on a node that was cloned in jstSelect_(), we
+  // will fall back to check for the attribute and set the property
+  // from cache.
+
+  // If the node has an attribute indexing a cache object, set it as a property
+  // and return it.
+  var jstid = domGetAttribute(node, ATT_jstcache);
+  if (jstid != null) {
+    return node[PROP_jstcache] = JstProcessor.jstcache_[jstid];
+  }
+
+  var attributeValues = JstProcessor.attributeValues_;
+  var attributeList = JstProcessor.attributeList_;
+  attributeList.length = 0;
+
+  // Look for interesting attributes.
+  for (var i = 0, I = jsLength(JST_ATTRIBUTES); i < I; ++i) {
+    var name = JST_ATTRIBUTES[i][0];
+    var value = domGetAttribute(node, name);
+    attributeValues[name] = value;
+    if (value != null) {
+      attributeList.push(name + "=" + value);
+    }
+  }
+
+  // If none found, mark this node to prevent further inspection, and return
+  // an empty cache object.
+  if (attributeList.length == 0) {
+    domSetAttribute(node, ATT_jstcache, STRING_zero);
+    return node[PROP_jstcache] = JstProcessor.jstcache_[0];
+  }
+
+  // If we already have a cache object corresponding to these attributes,
+  // annotate the node with it, and return it.
+  var attstring = attributeList.join(CHAR_ampersand);
+  if (jstid = JstProcessor.jstcacheattributes_[attstring]) {
+    domSetAttribute(node, ATT_jstcache, jstid);
+    return node[PROP_jstcache] = JstProcessor.jstcache_[jstid];
+  }
+
+  // Otherwise, build a new cache object.
+  var jstcache = {};
+  for (var i = 0, I = jsLength(JST_ATTRIBUTES); i < I; ++i) {
+    var att = JST_ATTRIBUTES[i];
+    var name = att[0];
+    var parse = att[1];
+    var value = attributeValues[name];
+    if (value != null) {
+      jstcache[name] = parse(value);
+      if (MAPS_DEBUG) {
+        jstcache.jstAttributeValues = jstcache.jstAttributeValues || {};
+        jstcache.jstAttributeValues[name] = value;
+      }
+    }
+  }
+
+  jstid = STRING_empty + ++JstProcessor.jstid_;
+  domSetAttribute(node, ATT_jstcache, jstid);
+  JstProcessor.jstcache_[jstid] = jstcache;
+  JstProcessor.jstcacheattributes_[attstring] = jstid;
+
+  return node[PROP_jstcache] = jstcache;
+};
+
+
+/**
+ * Runs the given function in our state machine.
+ *
+ * It's informative to view the set of all function calls as a tree:
+ * - nodes are states
+ * - edges are state transitions, implemented as calls to the pending
+ *   functions in the stack.
+ *   - pre-order function calls are downward edges (recursion into call).
+ *   - post-order function calls are upward edges (return from call).
+ * - leaves are nodes which do not recurse.
+ * We represent the call tree as an array of array of calls, indexed as
+ * stack[depth][index].  Here [depth] indexes into the call stack, and
+ * [index] indexes into the call queue at that depth.  We require a call
+ * queue so that a node may branch to more than one child
+ * (which will be called serially), typically due to a loop structure.
+ *
+ * @param {Function} f The first function to run.
+ */
+JstProcessor.prototype.run_ = function(f) {
+  var me = this;
+
+  /**
+   * A stack of queues of pre-order calls.
+   * The inner arrays (constituent queues) are structured as
+   * [ arg2, arg1, method, arg2, arg1, method, ...]
+   * ie. a flattened array of methods with 2 arguments, in reverse order
+   * for efficient push/pop.
+   *
+   * The outer array is a stack of such queues.
+   *
+   * @type Array.<Array>
+   */
+  var calls = me.calls_ = [];
+
+  /**
+   * The index into the queue for each depth. NOTE: Alternative would
+   * be to maintain the queues in reverse order (popping off of the
+   * end) but the repeated calls to .pop() consumed 90% of this
+   * function's execution time.
+   * @type Array.<number>
+   */
+  var queueIndices = me.queueIndices_ = [];
+
+  /**
+   * A pool of empty arrays.  Minimizes object allocation for IE6's benefit.
+   * @type Array.<Array>
+   */
+  var arrayPool = me.arrayPool_ = [];
+
+  f();
+  var queue, queueIndex;
+  var method, arg1, arg2;
+  var temp;
+  while (calls.length) {
+    queue = calls[calls.length - 1];
+    queueIndex = queueIndices[queueIndices.length - 1];
+    if (queueIndex >= queue.length) {
+      me.recycleArray_(calls.pop());
+      queueIndices.pop();
+      continue;
+    }
+
+    // Run the first function in the queue.
+    method = queue[queueIndex++];
+    arg1 = queue[queueIndex++];
+    arg2 = queue[queueIndex++];
+    queueIndices[queueIndices.length - 1] = queueIndex;
+    method.call(me, arg1, arg2);
+  }
+};
+
+
+/**
+ * Pushes one or more functions onto the stack.  These will be run in sequence,
+ * interspersed with any recursive calls that they make.
+ *
+ * This method takes ownership of the given array!
+ *
+ * @param {Array} args Array of method calls structured as
+ *     [ method, arg1, arg2, method, arg1, arg2, ... ]
+ */
+JstProcessor.prototype.push_ = function(args) {
+  this.calls_.push(args);
+  this.queueIndices_.push(0);
+};
+
+
+/**
+ * Enable/disable debugging.
+ * @param {boolean} debugging New state
+ */
+JstProcessor.prototype.setDebugging = function(debugging) {
+  if (MAPS_DEBUG) {
+    this.debugging_ = debugging;
+  }
+};
+
+
+JstProcessor.prototype.createArray_ = function() {
+  if (this.arrayPool_.length) {
+    return this.arrayPool_.pop();
+  } else {
+    return [];
+  }
+};
+
+
+JstProcessor.prototype.recycleArray_ = function(array) {
+  arrayClear(array);
+  this.arrayPool_.push(array);
+};
+
+/**
+ * Implements internals of jstProcess. This processes the two
+ * attributes transclude and jsselect, which replace or multiply
+ * elements, hence the name "outer". The remainder of the attributes
+ * is processed in jstProcessInner_(), below. That function
+ * jsProcessInner_() only processes attributes that affect an existing
+ * node, but doesn't create or destroy nodes, hence the name
+ * "inner". jstProcessInner_() is called through jstSelect_() if there
+ * is a jsselect attribute (possibly for newly created clones of the
+ * current template node), or directly from here if there is none.
+ *
+ * @param {JsEvalContext} context
+ *
+ * @param {Element} template
+ */
+JstProcessor.prototype.jstProcessOuter_ = function(context, template) {
+  var me = this;
+
+  var jstAttributes = me.jstAttributes_(template);
+  if (MAPS_DEBUG && me.debugging_) {
+    me.logState_('Outer', template, jstAttributes.jstAttributeValues);
+  }
+
+  var transclude = jstAttributes[ATT_transclude];
+  if (transclude) {
+    var tr = jstGetTemplate(transclude);
+    if (tr) {
+      domReplaceChild(tr, template);
+      var call = me.createArray_();
+      call.push(me.jstProcessOuter_, context, tr);
+      me.push_(call);
+    } else {
+      domRemoveNode(template);
+    }
+    return;
+  }
+
+  var select = jstAttributes[ATT_select];
+  if (select) {
+    me.jstSelect_(context, template, select);
+  } else {
+    me.jstProcessInner_(context, template);
+  }
+};
+
+
+/**
+ * Implements internals of jstProcess. This processes all attributes
+ * except transclude and jsselect. It is called either from
+ * jstSelect_() for nodes that have a jsselect attribute so that the
+ * jsselect attribute will not be processed again, or else directly
+ * from jstProcessOuter_(). See the comment on jstProcessOuter_() for
+ * an explanation of the name.
+ *
+ * @param {JsEvalContext} context
+ *
+ * @param {Element} template
+ */
+JstProcessor.prototype.jstProcessInner_ = function(context, template) {
+  var me = this;
+
+  var jstAttributes = me.jstAttributes_(template);
+  if (MAPS_DEBUG && me.debugging_) {
+    me.logState_('Inner', template, jstAttributes.jstAttributeValues);
+  }
+
+  // NOTE: See NOTE on ATT_content why this is a separate
+  // attribute, and not a special value in ATT_values.
+  var display = jstAttributes[ATT_display];
+  if (display) {
+    var shouldDisplay = context.jsexec(display, template);
+    if (MAPS_DEBUG && me.debugging_) {
+      me.logs_.push(ATT_display + ': ' + shouldDisplay + '<br/>');
+    }
+    if (!shouldDisplay) {
+      displayNone(template);
+      return;
+    }
+    displayDefault(template);
+  }
+
+  // NOTE: jsvars is evaluated before jsvalues, because it's
+  // more useful to be able to use var values in attribute value
+  // expressions than vice versa.
+  var values = jstAttributes[ATT_vars];
+  if (values) {
+    me.jstVars_(context, template, values);
+  }
+
+  values = jstAttributes[ATT_values];
+  if (values) {
+    me.jstValues_(context, template, values);
+  }
+
+  // Evaluate expressions immediately. Useful for hooking callbacks
+  // into jstemplates.
+  //
+  // NOTE: Evaluation order is sometimes significant, e.g. when
+  // the expression evaluated in jseval relies on the values set in
+  // jsvalues, so it needs to be evaluated *after*
+  // jsvalues. TODO: This is quite arbitrary, it would be
+  // better if this would have more necessity to it.
+  var expressions = jstAttributes[ATT_eval];
+  if (expressions) {
+    for (var i = 0, I = jsLength(expressions); i < I; ++i) {
+      context.jsexec(expressions[i], template);
+    }
+  }
+
+  var skip = jstAttributes[ATT_skip];
+  if (skip) {
+    var shouldSkip = context.jsexec(skip, template);
+    if (MAPS_DEBUG && me.debugging_) {
+      me.logs_.push(ATT_skip + ': ' + shouldSkip + '<br/>');
+    }
+    if (shouldSkip) return;
+  }
+
+  // NOTE: content is a separate attribute, instead of just a
+  // special value mentioned in values, for two reasons: (1) it is
+  // fairly common to have only mapped content, and writing
+  // content="expr" is shorter than writing values="content:expr", and
+  // (2) the presence of content actually terminates traversal, and we
+  // need to check for that. Display is a separate attribute for a
+  // reason similar to the second, in that its presence *may*
+  // terminate traversal.
+  var content = jstAttributes[ATT_content];
+  if (content) {
+    me.jstContent_(context, template, content);
+
+  } else {
+    // Newly generated children should be ignored, so we explicitly
+    // store the children to be processed.
+    var queue = me.createArray_();
+    var ctx = null;
+    for (var c = template.firstChild; c; c = c.nextSibling) {
+      if (c.nodeType == DOM_ELEMENT_NODE) {
+        // Construct a new context if needed, lazily.
+        if (!ctx) {
+          ctx = context; 
+          var selectInner = jstAttributes[ATT_innerselect];
+          if (selectInner && selectInner != VAR_this) {
+            ctx = context.clone(context.jsexec(selectInner, template), 0, 0);
+          }
+        }
+        queue.push(me.jstProcessOuter_, ctx, c);
+      }
+    }
+    if (queue.length) me.push_(queue);
+  }
+};
+
+
+/**
+ * Implements the jsselect attribute: evalutes the value of the
+ * jsselect attribute in the current context, with the current
+ * variable bindings (see JsEvalContext.jseval()). If the value is an
+ * array, the current template node is multiplied once for every
+ * element in the array, with the array element being the context
+ * object. If the array is empty, or the value is undefined, then the
+ * current template node is dropped. If the value is not an array,
+ * then it is just made the context object.
+ *
+ * @param {JsEvalContext} context The current evaluation context.
+ *
+ * @param {Element} template The currently processed node of the template.
+ *
+ * @param {Function} select The javascript expression to evaluate.
+ *
+ * @notypecheck FIXME(hmitchell): See OCL6434950. instance and value need
+ * type checks.
+ */
+JstProcessor.prototype.jstSelect_ = function(context, template, select) {
+  var me = this;
+
+  var value = context.jsexec(select, template);
+
+  // Enable reprocessing: if this template is reprocessed, then only
+  // fill the section instance here. Otherwise do the cardinal
+  // processing of a new template.
+  var instance = domGetAttribute(template, ATT_instance);
+
+  var instanceLast = false;
+  if (instance) {
+    if (instance.charAt(0) == CHAR_asterisk) {
+      instance = parseInt10(instance.substr(1));
+      instanceLast = true;
+    } else {
+      instance = parseInt10(/** @type string */(instance));
+    }
+  }
+
+  // The expression value instanceof Array is occasionally false for
+  // arrays, seen in Firefox. Thus we recognize an array as an object
+  // which is not null that has a length property. Notice that this
+  // also matches input data with a length property, so this property
+  // name should be avoided in input data.
+  var multiple = isArray(value);
+  var count = multiple ? jsLength(value) : 1;
+  var multipleEmpty = (multiple && count == 0);
+
+  if (multiple) {
+    if (multipleEmpty) {
+      // For an empty array, keep the first template instance and mark
+      // it last. Remove all other template instances.
+      if (!instance) {
+        domSetAttribute(template, ATT_instance, STRING_asteriskzero);
+        displayNone(template);
+      } else {
+        domRemoveNode(template);
+      }
+
+    } else {
+      displayDefault(template);
+      // For a non empty array, create as many template instances as
+      // are needed. If the template is first processed, as many
+      // template instances are needed as there are values in the
+      // array. If the template is reprocessed, new template instances
+      // are only needed if there are more array values than template
+      // instances. Those additional instances are created by
+      // replicating the last template instance.
+      //
+      // When the template is first processed, there is no jsinstance
+      // attribute. This is indicated by instance === null, except in
+      // opera it is instance === "". Notice also that the === is
+      // essential, because 0 == "", presumably via type coercion to
+      // boolean.
+      if (instance === null || instance === STRING_empty ||
+          (instanceLast && instance < count - 1)) {
+        // A queue of calls to push.
+        var queue = me.createArray_();
+
+        var instancesStart = instance || 0;
+        var i, I, clone;
+        for (i = instancesStart, I = count - 1; i < I; ++i) {
+          var node = domCloneNode(template);
+          domInsertBefore(node, template);
+
+          jstSetInstance(/** @type Element */(node), value, i);
+          clone = context.clone(value[i], i, count);
+
+          queue.push(me.jstProcessInner_, clone, node,
+                     JsEvalContext.recycle, clone, null);
+                     
+        }
+        // Push the originally present template instance last to keep
+        // the order aligned with the DOM order, because the newly
+        // created template instances are inserted *before* the
+        // original instance.
+        jstSetInstance(template, value, i);
+        clone = context.clone(value[i], i, count);
+        queue.push(me.jstProcessInner_, clone, template,
+                   JsEvalContext.recycle, clone, null);
+        me.push_(queue);
+      } else if (instance < count) {
+        var v = value[instance];
+
+        jstSetInstance(template, value, instance);
+        var clone = context.clone(v, instance, count);
+        var queue = me.createArray_();
+        queue.push(me.jstProcessInner_, clone, template,
+                   JsEvalContext.recycle, clone, null);
+        me.push_(queue);
+      } else {
+        domRemoveNode(template);
+      }
+    }
+  } else {
+    if (value == null) {
+      displayNone(template);
+    } else {
+      displayDefault(template);
+      var clone = context.clone(value, 0, 1);
+      var queue = me.createArray_();
+      queue.push(me.jstProcessInner_, clone, template,
+                 JsEvalContext.recycle, clone, null);
+      me.push_(queue);
+    }
+  }
+};
+
+
+/**
+ * Implements the jsvars attribute: evaluates each of the values and
+ * assigns them to variables in the current context. Similar to
+ * jsvalues, except that all values are treated as vars, independent
+ * of their names.
+ *
+ * @param {JsEvalContext} context Current evaluation context.
+ *
+ * @param {Element} template Currently processed template node.
+ *
+ * @param {Array} values Processed value of the jsvalues attribute: a
+ * flattened array of pairs. The second element in the pair is a
+ * function that can be passed to jsexec() for evaluation in the
+ * current jscontext, and the first element is the variable name that
+ * the value returned by jsexec is assigned to.
+ */
+JstProcessor.prototype.jstVars_ = function(context, template, values) {
+  for (var i = 0, I = jsLength(values); i < I; i += 2) {
+    var label = values[i];
+    var value = context.jsexec(values[i+1], template);
+    context.setVariable(label, value);
+  }
+};
+
+
+/**
+ * Implements the jsvalues attribute: evaluates each of the values and
+ * assigns them to variables in the current context (if the name
+ * starts with '$', javascript properties of the current template node
+ * (if the name starts with '.'), or DOM attributes of the current
+ * template node (otherwise). Since DOM attribute values are always
+ * strings, the value is coerced to string in the latter case,
+ * otherwise it's the uncoerced javascript value.
+ *
+ * @param {JsEvalContext} context Current evaluation context.
+ *
+ * @param {Element} template Currently processed template node.
+ *
+ * @param {Array} values Processed value of the jsvalues attribute: a
+ * flattened array of pairs. The second element in the pair is a
+ * function that can be passed to jsexec() for evaluation in the
+ * current jscontext, and the first element is the label that
+ * determines where the value returned by jsexec is assigned to.
+ */
+JstProcessor.prototype.jstValues_ = function(context, template, values) {
+  for (var i = 0, I = jsLength(values); i < I; i += 2) {
+    var label = values[i];
+    var value = context.jsexec(values[i+1], template);
+
+    if (label.charAt(0) == CHAR_dollar) {
+      // A jsvalues entry whose name starts with $ sets a local
+      // variable.
+      context.setVariable(label, value);
+
+    } else if (label.charAt(0) == CHAR_period) {
+      // A jsvalues entry whose name starts with . sets a property of
+      // the current template node. The name may have further dot
+      // separated components, which are translated into namespace
+      // objects. This specifically allows to set properties on .style
+      // using jsvalues. NOTE: Setting the style attribute has
+      // no effect in IE and hence should not be done anyway.
+      var nameSpaceLabel = label.substr(1).split(CHAR_period);
+      var nameSpaceObject = template;
+      var nameSpaceDepth = jsLength(nameSpaceLabel);
+      for (var j = 0, J = nameSpaceDepth - 1; j < J; ++j) {
+        var jLabel = nameSpaceLabel[j];
+        if (!nameSpaceObject[jLabel]) {
+          nameSpaceObject[jLabel] = {};
+        }
+        nameSpaceObject = nameSpaceObject[jLabel];
+      }
+      nameSpaceObject[nameSpaceLabel[nameSpaceDepth - 1]] = value;
+
+    } else if (label) {
+      // Any other jsvalues entry sets an attribute of the current
+      // template node.
+      if (typeof value == TYPE_boolean) {
+        // Handle boolean values that are set as attributes specially,
+        // according to the XML/HTML convention.
+        if (value) {
+          domSetAttribute(template, label, label);
+        } else {
+          domRemoveAttribute(template, label);
+        }
+      } else {
+        domSetAttribute(template, label, STRING_empty + value);
+      }
+    }
+  }
+};
+
+
+/**
+ * Implements the jscontent attribute. Evalutes the expression in
+ * jscontent in the current context and with the current variables,
+ * and assigns its string value to the content of the current template
+ * node.
+ *
+ * @param {JsEvalContext} context Current evaluation context.
+ *
+ * @param {Element} template Currently processed template node.
+ *
+ * @param {Function} content Processed value of the jscontent
+ * attribute.
+ */
+JstProcessor.prototype.jstContent_ = function(context, template, content) {
+  // NOTE: Profiling shows that this method costs significant
+  // time. In jstemplate_perf.html, it's about 50%. I tried to replace
+  // by HTML escaping and assignment to innerHTML, but that was even
+  // slower.
+  var value = STRING_empty + context.jsexec(content, template);
+  // Prevent flicker when refreshing a template and the value doesn't
+  // change.
+  if (template.innerHTML == value) {
+    return;
+  }
+  while (template.firstChild) {
+    domRemoveNode(template.firstChild);
+  }
+  var t = domCreateTextNode(this.document_, value);
+  domAppendChild(template, t);
+};
+
+
+/**
+ * Caches access to and parsing of template processing attributes. If
+ * domGetAttribute() is called every time a template attribute value
+ * is used, it takes more than 10% of the time.
+ *
+ * @param {Element} template A DOM element node of the template.
+ *
+ * @return {Object} A javascript object that has all js template
+ * processing attribute values of the node as properties.
+ */
+JstProcessor.prototype.jstAttributes_ = function(template) {
+  if (template[PROP_jstcache]) {
+    return template[PROP_jstcache];
+  }
+
+  var jstid = domGetAttribute(template, ATT_jstcache);
+  if (jstid) {
+    return template[PROP_jstcache] = JstProcessor.jstcache_[jstid];
+  }
+
+  return JstProcessor.prepareNode_(template);
+};
+
+
+/**
+ * Helps to implement the transclude attribute, and is the initial
+ * call to get hold of a template from its ID.
+ *
+ * If the ID is not present in the DOM, and opt_loadHtmlFn is specified, this
+ * function will call that function and add the result to the DOM, before
+ * returning the template.
+ *
+ * @param {string} name The ID of the HTML element used as template.
+ * @param {Function} opt_loadHtmlFn A function which, when called, will return
+ *   HTML that contains an element whose ID is 'name'.
+ *
+ * @return {Element|null} The DOM node of the template. (Only element nodes
+ * can be found by ID, hence it's a Element.)
+ */
+function jstGetTemplate(name, opt_loadHtmlFn) {
+  var doc = document;
+  var section;
+  if (opt_loadHtmlFn) {
+    section = jstLoadTemplateIfNotPresent(doc, name, opt_loadHtmlFn);
+  } else {
+    section = domGetElementById(doc, name);
+  }
+  if (section) {
+    JstProcessor.prepareTemplate_(section);
+    var ret = domCloneElement(section);
+    domRemoveAttribute(ret, STRING_id);
+    return ret;
+  } else {
+    return null;
+  }
+}
+
+/**
+ * This function is the same as 'jstGetTemplate' but, if the template
+ * does not exist, throw an exception.
+ *
+ * @param {string} name The ID of the HTML element used as template.
+ * @param {Function} opt_loadHtmlFn A function which, when called, will return
+ *   HTML that contains an element whose ID is 'name'.
+ *
+ * @return {Element} The DOM node of the template. (Only element nodes
+ * can be found by ID, hence it's a Element.)
+ */
+function jstGetTemplateOrDie(name, opt_loadHtmlFn) {
+  var x = jstGetTemplate(name, opt_loadHtmlFn);
+  check(x !== null);
+  return /** @type Element */(x);
+}
+
+
+/**
+ * If an element with id 'name' is not present in the document, call loadHtmlFn
+ * and insert the result into the DOM.
+ *
+ * @param {Document} doc
+ * @param {string} name
+ * @param {Function} loadHtmlFn A function that returns HTML to be inserted
+ * into the DOM.
+ * @param {string} opt_target The id of a DOM object under which to attach the
+ *   HTML once it's inserted.  An object with this id is created if it does not
+ *   exist.
+ * @return {Element} The node whose id is 'name'
+ */
+function jstLoadTemplateIfNotPresent(doc, name, loadHtmlFn, opt_target) {
+  var section = domGetElementById(doc, name);
+  if (section) {
+    return section;
+  }
+  // Load any necessary HTML and try again.
+  jstLoadTemplate_(doc, loadHtmlFn(), opt_target || STRING_jsts);
+  var section = domGetElementById(doc, name);
+  if (!section) {
+    log("Error: jstGetTemplate was provided with opt_loadHtmlFn, " +
+	"but that function did not provide the id '" + name + "'.");
+  }
+  return /** @type Element */(section);
+}
+
+
+/**
+ * Loads the given HTML text into the given document, so that
+ * jstGetTemplate can find it.
+ *
+ * We append it to the element identified by targetId, which is hidden.
+ * If it doesn't exist, it is created.
+ *
+ * @param {Document} doc The document to create the template in.
+ *
+ * @param {string} html HTML text to be inserted into the document.
+ *
+ * @param {string} targetId The id of a DOM object under which to attach the
+ *   HTML once it's inserted.  An object with this id is created if it does not
+ *   exist.
+ */
+function jstLoadTemplate_(doc, html, targetId) {
+  var existing_target = domGetElementById(doc, targetId);
+  var target;
+  if (!existing_target) {
+    target = domCreateElement(doc, STRING_div);
+    target.id = targetId;
+    displayNone(target);
+    positionAbsolute(target);
+    domAppendChild(doc.body, target);
+  } else {
+    target = existing_target;
+  }
+  var div = domCreateElement(doc, STRING_div);
+  target.appendChild(div);
+  div.innerHTML = html;
+}
+
+
+/**
+ * Sets the jsinstance attribute on a node according to its context.
+ *
+ * @param {Element} template The template DOM node to set the instance
+ * attribute on.
+ *
+ * @param {Array} values The current input context, the array of
+ * values of which the template node will render one instance.
+ *
+ * @param {number} index The index of this template node in values.
+ */
+function jstSetInstance(template, values, index) {
+  if (index == jsLength(values) - 1) {
+    domSetAttribute(template, ATT_instance, CHAR_asterisk + index);
+  } else {
+    domSetAttribute(template, ATT_instance, STRING_empty + index);
+  }
+}
+
+
+/**
+ * Log the current state.
+ * @param {string} caller An identifier for the caller of .log_.
+ * @param {Element} template The template node being processed.
+ * @param {Object} jstAttributeValues The jst attributes of the template node.
+ */
+JstProcessor.prototype.logState_ = function(
+    caller, template, jstAttributeValues) {
+  if (MAPS_DEBUG) {
+    var msg = '<table>';
+    msg += '<caption>' + caller + '</caption>';
+    msg += '<tbody>';
+    if (template.id) {
+      msg += '<tr><td>' + 'id:' + '</td><td>' + template.id + '</td></tr>';
+    }
+    if (template.name) {
+      msg += '<tr><td>' + 'name:' + '</td><td>' + template.name + '</td></tr>';
+    }
+    if (jstAttributeValues) {
+      msg += '<tr><td>' + 'attr:' +
+      '</td><td>' + jsToSource(jstAttributeValues) + '</td></tr>';
+    }
+    msg += '</tbody></table><br/>';
+    this.logs_.push(msg);
+  }
+};
+
+
+/**
+ * Retrieve the processing logs.
+ * @return {Array.<string>} The processing logs.
+ */
+JstProcessor.prototype.getLogs = function() {
+  return this.logs_;
+};

Propchange: incubator/shindig/trunk/features/src/main/javascript/features/opensocial-templates/jsTemplate/jstemplate.js
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/shindig/trunk/features/src/main/javascript/features/opensocial-templates/jsTemplate/jstemplate.js
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Added: incubator/shindig/trunk/features/src/main/javascript/features/opensocial-templates/jsTemplate/util.js
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/features/src/main/javascript/features/opensocial-templates/jsTemplate/util.js?rev=761791&view=auto
==============================================================================
--- incubator/shindig/trunk/features/src/main/javascript/features/opensocial-templates/jsTemplate/util.js (added)
+++ incubator/shindig/trunk/features/src/main/javascript/features/opensocial-templates/jsTemplate/util.js Fri Apr  3 21:01:28 2009
@@ -0,0 +1,475 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ */
+
+/**
+ * @fileoverview Miscellaneous constants and functions referenced in
+ * the main source files.
+ *
+ * @author Steffen Meschkat (mesch@google.com)
+ */
+
+var MAPS_DEBUG = false;
+
+function log(msg) {}
+
+// String literals defined globally and not to be inlined. (IE6 perf)
+/** @const */ var STRING_empty = '';
+
+/** @const */ var CSS_display = 'display';
+/** @const */ var CSS_position = 'position';
+
+// Constants for possible values of the typeof operator.
+var TYPE_boolean = 'boolean';
+var TYPE_number = 'number';
+var TYPE_object = 'object';
+var TYPE_string = 'string';
+var TYPE_function = 'function';
+var TYPE_undefined = 'undefined';
+
+
+/**
+ * Wrapper for the eval() builtin function to evaluate expressions and
+ * obtain their value. It wraps the expression in parentheses such
+ * that object literals are really evaluated to objects. Without the
+ * wrapping, they are evaluated as block, and create syntax
+ * errors. Also protects against other syntax errors in the eval()ed
+ * code and returns null if the eval throws an exception.
+ *
+ * @param {string} expr
+ * @return {Object|null}
+ */
+function jsEval(expr) {
+  try {
+    // NOTE: An alternative idiom would be:
+    //
+    //   eval('(' + expr + ')');
+    //
+    // Note that using the square brackets as below, "" evals to undefined.
+    // The alternative of using parentheses does not work when evaluating
+    // function literals in IE.
+    // e.g. eval("(function() {})") returns undefined, and not a function
+    // object, in IE.
+    return eval('[' + expr + '][0]');
+  } catch (e) {
+    log('EVAL FAILED ' + expr + ': ' + e);
+    return null;
+  }
+}
+
+function jsLength(obj) {
+  return obj.length;
+}
+
+function assert(obj) {}
+
+/**
+ * Copies all properties from second object to the first.  Modifies to.
+ *
+ * @param {Object} to  The target object.
+ * @param {Object} from  The source object.
+ */
+function copyProperties(to, from) {
+  for (var p in from) {
+    to[p] = from[p];
+  }
+}
+
+
+/**
+ * @param {Object|null|undefined} value The possible value to use.
+ * @param {Object} defaultValue The default if the value is not set.
+ * @return {Object} The value, if it is
+ * defined and not null; otherwise the default
+ */
+function getDefaultObject(value, defaultValue) {
+  if (typeof value != TYPE_undefined && value != null) {
+    return /** @type Object */(value);
+  } else {
+    return defaultValue;
+  }
+}
+
+/**
+ * Detect if an object looks like an Array.
+ * Note that instanceof Array is not robust; for example an Array
+ * created in another iframe fails instanceof Array.
+ * @param {Object|null} value Object to interrogate
+ * @return {boolean} Is the object an array?
+ */
+function isArray(value) {
+  return value != null &&
+      typeof value == TYPE_object &&
+      typeof value.length == TYPE_number;
+}
+
+
+/**
+ * Finds a slice of an array.
+ *
+ * @param {Array} array  Array to be sliced.
+ * @param {number} start  The start of the slice.
+ * @param {number} opt_end  The end of the slice (optional).
+ * @return {Array} array  The slice of the array from start to end.
+ */
+function arraySlice(array, start, opt_end) {
+  // Use
+  //   return Function.prototype.call.apply(Array.prototype.slice, arguments);
+  // instead of the simpler
+  //   return Array.prototype.slice.call(array, start, opt_end);
+  // here because of a bug in the FF and IE implementations of
+  // Array.prototype.slice which causes this function to return an empty list
+  // if opt_end is not provided.
+  return Function.prototype.call.apply(Array.prototype.slice, arguments);
+}
+
+
+/**
+ * Jscompiler wrapper for parseInt() with base 10.
+ *
+ * @param {string} s string repersentation of a number.
+ *
+ * @return {number} The integer contained in s, converted on base 10.
+ */
+function parseInt10(s) {
+  return parseInt(s, 10);
+}
+
+
+/**
+ * Clears the array by setting the length property to 0. This usually
+ * works, and if it should turn out not to work everywhere, here would
+ * be the place to implement the browser specific workaround.
+ *
+ * @param {Array} array  Array to be cleared.
+ */
+function arrayClear(array) {
+  array.length = 0;
+}
+
+
+/**
+ * Prebinds "this" within the given method to an object, but ignores all 
+ * arguments passed to the resulting function.
+ * I.e. var_args are all the arguments that method is invoked with when
+ * invoking the bound function.
+ *
+ * @param {Object|null} object  The object that the method call targets.
+ * @param {Function} method  The target method.
+ * @return {Function}  Method with the target object bound to it and curried by
+ *                     the provided arguments.
+ */
+function bindFully(object, method, var_args) {
+  var args = arraySlice(arguments, 2);
+  return function() {
+    return method.apply(object, args);
+  }
+}
+
+// Based on <http://www.w3.org/TR/2000/ REC-DOM-Level-2-Core-20001113/
+// core.html#ID-1950641247>.
+var DOM_ELEMENT_NODE = 1;
+var DOM_ATTRIBUTE_NODE = 2;
+var DOM_TEXT_NODE = 3;
+var DOM_CDATA_SECTION_NODE = 4;
+var DOM_ENTITY_REFERENCE_NODE = 5;
+var DOM_ENTITY_NODE = 6;
+var DOM_PROCESSING_INSTRUCTION_NODE = 7;
+var DOM_COMMENT_NODE = 8;
+var DOM_DOCUMENT_NODE = 9;
+var DOM_DOCUMENT_TYPE_NODE = 10;
+var DOM_DOCUMENT_FRAGMENT_NODE = 11;
+var DOM_NOTATION_NODE = 12;
+
+
+
+function domGetElementById(document, id) {
+  return document.getElementById(id);
+}
+
+/**
+ * Creates a new node in the given document
+ *
+ * @param {Document} doc  Target document.
+ * @param {string} name  Name of new element (i.e. the tag name)..
+ * @return {Element}  Newly constructed element.
+ */
+function domCreateElement(doc, name) {
+  return doc.createElement(name);
+}
+
+/**
+ * Traverses the element nodes in the DOM section underneath the given
+ * node and invokes the given callback as a method on every element
+ * node encountered.
+ *
+ * @param {Element} node  Parent element of the subtree to traverse.
+ * @param {Function} callback  Called on each node in the traversal.
+ */
+function domTraverseElements(node, callback) {
+  var traverser = new DomTraverser(callback);
+  traverser.run(node);
+}
+
+/**
+ * A class to hold state for a dom traversal.
+ * @param {Function} callback  Called on each node in the traversal.
+ * @constructor
+ * @class
+ */
+function DomTraverser(callback) {
+  this.callback_ = callback;
+}
+
+/**
+ * Processes the dom tree in breadth-first order.
+ * @param {Element} root  The root node of the traversal.
+ */
+DomTraverser.prototype.run = function(root) {
+  var me = this;
+  me.queue_ = [ root ];
+  while (jsLength(me.queue_)) {
+    me.process_(me.queue_.shift());
+  }
+}
+
+/**
+ * Processes a single node.
+ * @param {Element} node  The current node of the traversal.
+ */
+DomTraverser.prototype.process_ = function(node) {
+  var me = this;
+
+  me.callback_(node);
+
+  for (var c = node.firstChild; c; c = c.nextSibling) {
+    if (c.nodeType == DOM_ELEMENT_NODE) {
+      me.queue_.push(c);
+    }
+  }
+}
+
+/**
+ * Get an attribute from the DOM.  Simple redirect, exists to compress code.
+ *
+ * @param {Element} node  Element to interrogate.
+ * @param {string} name  Name of parameter to extract.
+ * @return {string|null}  Resulting attribute.
+ */
+function domGetAttribute(node, name) {
+  return node.getAttribute(name);
+  // NOTE: Neither in IE nor in Firefox, HTML DOM attributes
+  // implement namespaces. All items in the attribute collection have
+  // null localName and namespaceURI attribute values. In IE, we even
+  // encounter DIV elements that don't implement the method
+  // getAttributeNS().
+}
+
+
+/**
+ * Set an attribute in the DOM.  Simple redirect to compress code.
+ *
+ * @param {Element} node  Element to interrogate.
+ * @param {string} name  Name of parameter to set.
+ * @param {string|number} value  Set attribute to this value.
+ */
+function domSetAttribute(node, name, value) {
+  node.setAttribute(name, value);
+}
+
+/**
+ * Remove an attribute from the DOM.  Simple redirect to compress code.
+ *
+ * @param {Element} node  Element to interrogate.
+ * @param {string} name  Name of parameter to remove.
+ */
+function domRemoveAttribute(node, name) {
+  node.removeAttribute(name);
+}
+
+/**
+ * Clone a node in the DOM.
+ *
+ * @param {Node} node  Node to clone.
+ * @return {Node}  Cloned node.
+ */
+function domCloneNode(node) {
+  return node.cloneNode(true);
+  // NOTE: we never so far wanted to use cloneNode(false),
+  // hence the default.
+}
+
+/**
+ * Clone a element in the DOM.
+ *
+ * @param {Element} element  Element to clone.
+ * @return {Element}  Cloned element.
+ */
+function domCloneElement(element) {
+  return /** @type {Element} */(domCloneNode(element));
+}
+
+/**
+ * Returns the document owner of the given element. In particular,
+ * returns window.document if node is null or the browser does not
+ * support ownerDocument.  If the node is a document itself, returns
+ * itself.
+ *
+ * @param {Node|null|undefined} node  The node whose ownerDocument is required.
+ * @returns {Document}  The owner document or window.document if unsupported.
+ */
+function ownerDocument(node) {
+  if (!node) {
+    return document;
+  } else if (node.nodeType == DOM_DOCUMENT_NODE) {
+    return /** @type Document */(node);
+  } else {
+    return node.ownerDocument || document;
+  }
+}
+
+/**
+ * Creates a new text node in the given document.
+ *
+ * @param {Document} doc  Target document.
+ * @param {string} text  Text composing new text node.
+ * @return {Text}  Newly constructed text node.
+ */
+function domCreateTextNode(doc, text) {
+  return doc.createTextNode(text);
+}
+
+/**
+ * Appends a new child to the specified (parent) node.
+ *
+ * @param {Element} node  Parent element.
+ * @param {Node} child  Child node to append.
+ * @return {Node}  Newly appended node.
+ */
+function domAppendChild(node, child) {
+  return node.appendChild(child);
+}
+
+/**
+ * Sets display to default.
+ *
+ * @param {Element} node  The dom element to manipulate.
+ */
+function displayDefault(node) {
+  node.style[CSS_display] = '';
+}
+
+/**
+ * Sets display to none. Doing this as a function saves a few bytes for
+ * the 'style.display' property and the 'none' literal.
+ *
+ * @param {Element} node  The dom element to manipulate.
+ */
+function displayNone(node) {
+  node.style[CSS_display] = 'none';
+}
+
+
+/**
+ * Sets position style attribute to absolute.
+ *
+ * @param {Element} node  The dom element to manipulate.
+ */
+function positionAbsolute(node) {
+  node.style[CSS_position] = 'absolute';
+}
+
+
+/**
+ * Inserts a new child before a given sibling.
+ *
+ * @param {Node} newChild  Node to insert.
+ * @param {Node} oldChild  Sibling node.
+ * @return {Node}  Reference to new child.
+ */
+function domInsertBefore(newChild, oldChild) {
+  return oldChild.parentNode.insertBefore(newChild, oldChild);
+}
+
+/**
+ * Replaces an old child node with a new child node.
+ *
+ * @param {Node} newChild  New child to append.
+ * @param {Node} oldChild  Old child to remove.
+ * @return {Node}  Replaced node.
+ */
+function domReplaceChild(newChild, oldChild) {
+  return oldChild.parentNode.replaceChild(newChild, oldChild);
+}
+
+/**
+ * Removes a node from the DOM.
+ *
+ * @param {Node} node  The node to remove.
+ * @return {Node}  The removed node.
+ */
+function domRemoveNode(node) {
+  return domRemoveChild(node.parentNode, node);
+}
+
+/**
+ * Remove a child from the specified (parent) node.
+ *
+ * @param {Element} node  Parent element.
+ * @param {Node} child  Child node to remove.
+ * @return {Node}  Removed node.
+ */
+function domRemoveChild(node, child) {
+  return node.removeChild(child);
+}
+
+
+/**
+ * Trim whitespace from begin and end of string.
+ *
+ * @see testStringTrim();
+ *
+ * @param {string} str  Input string.
+ * @return {string}  Trimmed string.
+ */
+function stringTrim(str) {
+  return stringTrimRight(stringTrimLeft(str));
+}
+
+/**
+ * Trim whitespace from beginning of string.
+ *
+ * @see testStringTrimLeft();
+ *
+ * @param {string} str  Input string.
+ * @return {string}  Trimmed string.
+ */
+function stringTrimLeft(str) {
+  return str.replace(/^\s+/, "");
+}
+
+/**
+ * Trim whitespace from end of string.
+ *
+ * @see testStringTrimRight();
+ *
+ * @param {string} str  Input string.
+ * @return {string}  Trimmed string.
+  */
+function stringTrimRight(str) {
+  return str.replace(/\s+$/, "");
+}

Propchange: incubator/shindig/trunk/features/src/main/javascript/features/opensocial-templates/jsTemplate/util.js
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/shindig/trunk/features/src/main/javascript/features/opensocial-templates/jsTemplate/util.js
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Modified: incubator/shindig/trunk/features/src/test/javascript/features/opensocial-templates/index.html
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/features/src/test/javascript/features/opensocial-templates/index.html?rev=761791&r1=761790&r2=761791&view=diff
==============================================================================
--- incubator/shindig/trunk/features/src/test/javascript/features/opensocial-templates/index.html (original)
+++ incubator/shindig/trunk/features/src/test/javascript/features/opensocial-templates/index.html Fri Apr  3 21:01:28 2009
@@ -36,10 +36,10 @@
     </script>
     
     <!-- the set of js files that make up opensocial-templates feature, as they appear in feature.xml -->
-    <script src="http://google-jstemplate.googlecode.com/svn/trunk/util.js"></script>
-    <script src="http://google-jstemplate.googlecode.com/svn/trunk/jsevalcontext.js"></script>
-    <script src="http://google-jstemplate.googlecode.com/svn/trunk/jstemplate.js"></script>
-    <script src="../../../../main/javascript/features/opensocial-template/jstemplate_debug.js"></script>
+    <script src="../../../../main/javascript/features/opensocial-templates/jsTemplate/util.js"></script>
+    <script src="../../../../main/javascript/features/opensocial-templates/jsTemplate/jsevalcontext.js"></script>
+    <script src="../../../../main/javascript/features/opensocial-templates/jsTemplate/jstemplate.js"></script>
+    <script src="../../../../main/javascript/features/opensocial-templates/jstemplate_debug.js"></script>
     <script src="../../../../main/javascript/features/opensocial-data-context/datacontext.js"></script>
     <script src="../../../../main/javascript/features/xmlutil/xmlutil.js"></script>
     <script src="../../../../main/javascript/features/opensocial-data/data.js"></script>
@@ -126,11 +126,11 @@
       <a href="${url}">${name}</a> (${$my.foo})
     </xmp>
     <xmp id="my:record" style="display: none">
-      <b style="color: ${$my.color}">${title}</b>: <my:user context="user" foo="${$my.foo}"/>
+      <b style="color: ${My.color}">${title}</b>: <my:user foo="${My.foo}" cur="user"/>
     </xmp>
     <xmp id="_T_Substitution_nested" style="display: none">
       <div repeat="users">
-        <my:record color="${color}" foo="${user.id}"/>
+        <my:record color="${color}" foo="${user.id}" cur="Cur"/>
       </div>
     </xmp>
 

Modified: incubator/shindig/trunk/features/src/test/javascript/features/opensocial-templates/template_test.js
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/features/src/test/javascript/features/opensocial-templates/template_test.js?rev=761791&r1=761790&r2=761791&view=diff
==============================================================================
--- incubator/shindig/trunk/features/src/test/javascript/features/opensocial-templates/template_test.js (original)
+++ incubator/shindig/trunk/features/src/test/javascript/features/opensocial-templates/template_test.js Fri Apr  3 21:01:28 2009
@@ -375,7 +375,7 @@
   var data = {
     data: "Some default data"
   };
-  var template = os.compileTemplateString("<custom:input value=\"data\"/>");
+  var template = os.compileTemplateString("<custom:input value=\"data\" cur=\"Cur\"/>");
   var output = template.render(data);
 
   // extract contentNode
@@ -434,8 +434,7 @@
       ['<Template tag="os:HelloWorldWithContent">' + content + '</Template>']);
   };
 
-  tryTemplateContent('<os:renderAll/>');
-  tryTemplateContent('<os:RenderAll/>');
+  tryTemplateContent('<os:Render/>');
 }
 
 function testNamedContent() {
@@ -444,7 +443,7 @@
       '<div>' +
       '<os:HelloWorldWithNamedContent>' +
         '<os:DontShowThis>Don\'t show this</os:DontShowThis>' +
-        '<os:Content>Hello <b>world!</b></os:Content>' +
+        '<os:Foo>Hello <b>world!</b></os:Foo>' +
         '<Content>Hello <b>world!</b></Content>' +
       '</os:HelloWorldWithNamedContent>' +
       '</div>',
@@ -453,18 +452,18 @@
       null,
       ['<Template tag="os:HelloWorldWithNamedContent">' + content + '</Template>']);
   };
-  tryTemplateContent('<os:Render content="os:Content"/>');
+  tryTemplateContent('<os:Render content="os:Foo"/>');
   tryTemplateContent('<os:Render content="Content"/>');
 
   // Not working yet:
   /*
-  tryTemplateContent('<os:renderAll content="${my.os:Content}"/>');
-  tryTemplateContent('<os:renderAll content="my.os:Content"/>');
-  tryTemplateContent('<os:renderAll content="${My.os:Content}"/>');
-  tryTemplateContent('<os:renderAll content="${my.Content}"/>');
-  tryTemplateContent('<os:renderAll content="my.Content"/>');
-  tryTemplateContent('<os:renderAll content="${My.Content}"/>');
-  tryTemplateContent('<os:renderAll content="${Content}"/>');
+  tryTemplateContent('<os:Render content="${my.os:Content}"/>');
+  tryTemplateContent('<os:Render content="my.os:Content"/>');
+  tryTemplateContent('<os:Render content="${My.os:Content}"/>');
+  tryTemplateContent('<os:Render content="${my.Content}"/>');
+  tryTemplateContent('<os:Render content="my.Content"/>');
+  tryTemplateContent('<os:Render content="${My.Content}"/>');
+  tryTemplateContent('<os:Render content="${Content}"/>');
   */
 }
 
@@ -473,8 +472,6 @@
     assertTemplateOutput(
       '<os:HelloWorldRepeatedContent>' +
         '<Word>Hello</Word>' +
-        '<Word>world!</Word>' +
-        '<os:Word>Hello</os:Word>' +
         '<os:Word>world!</os:Word>' +
       '</os:HelloWorldRepeatedContent>',
 
@@ -483,27 +480,22 @@
       ['<Template tag="os:HelloWorldRepeatedContent">' + content + '</Template>']);
   };
 
-  tryTemplateContent('<div><span repeat="$my.Word"><os:renderAll/></span></div>');
-  tryTemplateContent('<div><span repeat="${$my.Word}"><os:renderAll/></span></div>');
-  tryTemplateContent('<div><span repeat="${$my.os:Word}"><os:renderAll/></span></div>');
-  tryTemplateContent('<div><span repeat="$my.os:Word"><os:renderAll/></span></div>');
-  tryTemplateContent('<div><span repeat="${my.os:Word}"><os:renderAll/></span></div>');
-  tryTemplateContent('<div><span repeat="$my.os:Word"><os:renderAll/></span></div>');
-  tryTemplateContent('<div><span repeat="${My.os:Word}"><os:renderAll/></span></div>');
+  tryTemplateContent('<div><span repeat="${My.Word}"><os:Render/></span></div>');
+  tryTemplateContent('<div><span repeat="${Word}"><os:Render/></span></div>');
 
   // Not working yet because $my must be explicit:
   /*
-    tryTemplateContent('<div><span repeat="${Word}"><os:renderAll/></span></div>');
-    tryTemplateContent('<div><span repeat="${os:Word}"><os:renderAll/></span></div>');
-    tryTemplateContent('<div><span repeat="Word"><os:renderAll/></span></div>');
-    tryTemplateContent('<div><span repeat="os:Word"><os:renderAll/></span></div>');
+    tryTemplateContent('<div><span repeat="${Word}"><os:Render/></span></div>');
+    tryTemplateContent('<div><span repeat="${os:Word}"><os:Render/></span></div>');
+    tryTemplateContent('<div><span repeat="Word"><os:Render/></span></div>');
+    tryTemplateContent('<div><span repeat="os:Word"><os:Render/></span></div>');
   */
 };
 
 /**
  * Bug when calling a repeat twice - 2nd time fails
  *
- * This is because <os:renderAll> moves the child tags out to destination, so
+ * This is because <os:Render> moves the child tags out to destination, so
  * the second loop is empty.
  */
 function testRepeatedContentTwice() {
@@ -518,8 +510,8 @@
     null,
     ['<Template tag="os:HelloWorldRepeatedContent">
       '<div>' +
-      '<div><span repeat="$my.os:Word"><os:renderAll/></span></div>' +
-      '<div><span repeat="$my.os:Word"><os:renderAll/></span></div>' +
+      '<div><span repeat="$my.os:Word"><os:Render/></span></div>' +
+      '<div><span repeat="$my.os:Word"><os:Render/></span></div>' +
       '</Template>']
     );
   */
@@ -530,8 +522,8 @@
  * Probably should just include no data.
  *
  * I.e.
- * <os:renderAll content="${os:NoMatch}"/> currently has same output as
- * <os:renderAll/>
+ * <os:Render content="${os:NoMatch}"/> currently has same output as
+ * <os:Render/>
  */
 function testRenderAllBadExprInContent() {
   /*
@@ -545,7 +537,7 @@
     '<div></div>',
     null,
     ['<Template tag="os:HelloWorldBadExpr">' +
-     '<os:renderAll content="${os:NoMatch}"/>' +
+     '<os:Render content="${os:NoMatch}"/>' +
      '</Template>']);
   */
 }
@@ -623,13 +615,13 @@
 
   assertTemplateOutput(
     '<os:DynamicRepeat>' +
-      '<Word repeat="WordObjects">${$cur.value}</Word>' +
+      '<Word repeat="WordObjects">${Cur.value}</Word>' +
     '</os:DynamicRepeat>',
     '<div>Helloworld!</div>',
     {WordObjects: [{value: 'Hello'}, {value: 'world!'}]},
 
     ['<Template tag="os:DynamicRepeat">' +
-     '<div><span repeat="$my.Word"><os:renderAll/></span></div>' +
+     '<div><span repeat="My.Word"><os:Render/></span></div>' +
      '</Template>']);
 
 };
@@ -738,3 +730,42 @@
   tryTemplateContent('<div>\n  <os:msg>Hello</os:msg>' +
       '  <os:msg>world!</os:msg>\n</div>');
 };
+
+function testVariablePrecedence() { 
+  // TODO: Update tests to reflect @cur not propagating into custom tags  
+  // Precedence should be ${Cur} -> ${My} -> ${Top}  
+  var tryTemplateContent = function(templateText, data) {
+    var output = os.compileTemplateString(templateText).render(data);
+    assertEquals('Right', domutil.getVisibleTextTrim(output));
+  }
+  os.Loader.loadContent('<Templates xmlns:os="uri:unused">' + 
+    '<Template tag="os:msg">${Value}</Template></Templates>');
+  
+  tryTemplateContent('<os:msg/>', { Value: 'Right' } );
+  tryTemplateContent('<os:msg Value="Right"/>', { } );
+  tryTemplateContent('<os:msg Value="Wrong" cur="${Top}"/>', { Value: 'Right' } );
+  tryTemplateContent('<os:msg Value="Right"/>', { Value: 'Wrong' } );
+  tryTemplateContent('<os:msg cur="${Inner}"/>', { Value: 'Wrong', Inner: { Value: 'Right' }} );
+  tryTemplateContent('<os:msg cur="${Inner}" Value="Wrong"/>', { Value: 'Wrong', Inner: { Value: 'Right' }} );
+  tryTemplateContent('<os:msg cur="${Inner}"/>', { Value: 'Right', Inner: { Foo: 'Bar' }} );
+  tryTemplateContent('<os:msg cur="${Inner}" Value="Right"/>', { Value: 'Wrong', Inner: { Foo: 'Bar' }} );
+};
+
+function testOsRepeat() {
+  var data = { list : [ { name: 'a' }, { name: 'b' }, { name: 'c' } ] };
+  var output = os.compileTemplateString('<os:Repeat expression="${list}"><b>${name}</b> <b>${name}</b> </os:Repeat>').render(data);
+  assertEquals("a a b b c c", domutil.getVisibleTextTrim(output));
+  
+  output = os.compileTemplateString('<select><os:Repeat expression="${list}"><option>${name}</option><option>${name} again</option></os:Repeat></select>').render(data);
+  assertEquals(6, output.firstChild.options.length);
+  
+  output = os.compileTemplateString('<table><os:Repeat expression="${list}"><tr><td>${name}</td></tr><tr><td>${name} again</td></tr></os:Repeat></table>').render(data);
+  console.log(output.firstChild);
+  assertEquals(6, output.firstChild.rows.length);
+};
+
+function testOsIf() {
+  var data = { list : [ { name: 'a' }, { name: 'b' }, { name: 'c' } ] };
+  var output = os.compileTemplateString('<os:Repeat expression="${list}"><os:If condition="${name != \'b\'}"><b>${name}</b> <b>${name}</b> </os:If></os:Repeat>').render(data);
+  assertEquals("a a c c", domutil.getVisibleTextTrim(output));
+};