Changeset 12310

Timestamp:

02/07/08 09:26:43 (11 months ago)

Author:

pottedmeat

Message:

Refs #4525.

• Make sure that passing constructors is clear
  
• !strict
  

Location:

dojox/trunk

Files:

• date/php.js (modified) (1 diff)
• dtl/html.js (modified) (1 diff)
• dtl/tag/date.js (modified) (1 diff)
• dtl/tag/loop.js (modified) (2 diffs)
• dtl/tag/misc.js (modified) (3 diffs)
• dtl/utils/date.js (modified) (1 diff)
• dtl/_base.js (modified) (1 diff)

dojox/trunk/date/php.js

@@ -187 +187 @@
         y: function(){
                 // summary: A two digit representation of a year
-                return this.date.getFullYear.substsring(2, 4);
+                return this.Y().slice(-2);
         },
 

dojox/trunk/dtl/html.js

@@ -708 +708 @@
                 return dojox.dtl.Parser.prototype.skipPast.call(this, endtag);
         },
-        getVarNode: function(){
+        getVarNodeConstructor: function(){
                 return dojox.dtl.HtmlVarNode;
         },
-        getTextNode: function(){
+        getTextNodeConstructor: function(){
                 return dojox.dtl.HtmlTextNode;
         },

dojox/trunk/dtl/tag/date.js

@@ -22 +22 @@
         }
         var format = parts[1];
-        return new dojox.dtl.tag.date.NowNode(format, parser.getTextNode());
+        return new dojox.dtl.tag.date.NowNode(format, parser.getTextNodeConstructor());
 }

dojox/trunk/dtl/tag/loop.js

@@ -113 +113 @@
                 var name = args[args.length - 1];
 
-                var node = new dojox.dtl.tag.loop.CycleNode(args.slice(1, args.length - 2), name, parser.getVarNode());
+                var node = new dojox.dtl.tag.loop.CycleNode(args.slice(1, args.length - 2), name, parser.getVarNodeConstructor());
 
                 if(!parser._namedCycleNodes){
@@ -120 +120 @@
                 parser._namedCycleNodes[name] = node;
         }else{
-                node = new dojox.dtl.tag.loop.CycleNode(args.slice(1), null, parser.getVarNode());
+                node = new dojox.dtl.tag.loop.CycleNode(args.slice(1), null, parser.getVarNodeConstructor());
         }
 

dojox/trunk/dtl/tag/misc.js

@@ -89 +89 @@
 dojox.dtl.tag.misc.debug = function(parser, text){
         // summary: Output the current context, maybe add more stuff later.
-        return new dojox.dtl.tag.misc.DebugNode(parser.getTextNode());
+        return new dojox.dtl.tag.misc.DebugNode(parser.getTextNodeConstructor());
 }
 
@@ -95 +95 @@
         // summary: Filter the contents of the blog through variable filters.
         var parts = text.split(" ", 2);
-        var varnode = new (parser.getVarNode())("var|" + parts[1]);
+        var varnode = new (parser.getVarNodeConstructor())("var|" + parts[1]);
         var nodelist = parser.parse(["endfilter"]);
         parser.next();
@@ -106 +106 @@
                 throw new Error("'firstof' statement requires at least one argument");
         }
-        return new dojox.dtl.tag.misc.FirstOfNode(parts, parser.getTextNode());
+        return new dojox.dtl.tag.misc.FirstOfNode(parts, parser.getTextNodeConstructor());
 }

dojox/trunk/dtl/utils/date.js

@@ -65 +65 @@
                 [60 * 1000, function(n){ return (n == 1) ? 'minute' : 'minutes'; }]
         ],
-        _months_ap: ["Jan.", "Feb.", "March", "April", "May", "June", "July", "Aug.", "Sept.", "Oct.", "Nov.", "Dec."],
+        _months_ap: ["Jan.", "Feb.", "March", "April", "May", "June", "July", "Aug.", "Sept.", "Oct.", "Nov.", "Dec."]
 });

dojox/trunk/dtl/_base.js

@@ -369 +369 @@
                         throw new Error("Unclosed tag found when looking for " + endtag);
                 },
-                getVarNode: function(){
+                getVarNodeConstructor: function(){
                         return dd._VarNode;
                 },
-                getTextNode: function(){
+                getTextNodeConstructor: function(){
                         return dd._TextNode;
                 },