Author: jmorliaguet
Date: Sun Feb 19 14:01:07 2006
New Revision: 2432

Added:
   
cpsskins/branches/jmo-perspectives/ui/framework/tests/functional/cpsskins_widget_template_test.html
      - copied unchanged from r2430, 
cpsskins/branches/jmo-perspectives/ui/framework/tests/functional/cpsskins_widget_templates.html
Removed:
   
cpsskins/branches/jmo-perspectives/ui/framework/tests/functional/cpsskins_widget_templates.html
Modified:
   cpsskins/branches/jmo-perspectives/ui/framework/cpsskins.js
   
cpsskins/branches/jmo-perspectives/ui/framework/tests/functional/cpsskins_observer_test.html
   cpsskins/branches/jmo-perspectives/ui/framework/tests/functional/tests.html
   cpsskins/branches/jmo-perspectives/ui/framework/tests/unit/cpsskins_test.html
   
cpsskins/branches/jmo-perspectives/ui/framework/tests/zope3/functional/latency/cpsskins_latency.pt
   
cpsskins/branches/jmo-perspectives/ui/framework/tests/zope3/functional/latency/cpsskins_typewriter.pt
   
cpsskins/branches/jmo-perspectives/ui/framework/tests/zope3/functional/quiz/cpsskins_quiz.pt
Log:

- cleaned up the global namespace, all classes / objects
  are now located under CPSSkins.___
 


Modified: cpsskins/branches/jmo-perspectives/ui/framework/cpsskins.js
==============================================================================
--- cpsskins/branches/jmo-perspectives/ui/framework/cpsskins.js (original)
+++ cpsskins/branches/jmo-perspectives/ui/framework/cpsskins.js Sun Feb 19 
14:01:07 2006
@@ -209,7 +209,7 @@
 
         case "controller": {
           var controller_type = def.type || "command";
-          var factory = Controllers[controller_type];
+          var factory = CPSSkins.Controllers[controller_type];
           if (factory) {
             var controller = factory(el, def);
             CPSSkins._controllers[name] = controller;
@@ -238,12 +238,12 @@
             widget_type = def.widget.type;
             if (!widget_type) {
               CPSSkins.warn("Must specify a widget type or a template", el);
-            } else if (!(widget_type in Widgets)) {
+            } else if (!(widget_type in CPSSkins.Widgets)) {
               CPSSkins.warn("Unknown widget type: " + widget_type, el);
             }
           }
 
-          factory = Widgets[widget_type];
+          factory = CPSSkins.Widgets[widget_type];
           view = factory(def);
 
           /* create the view */
@@ -387,8 +387,8 @@
 
 }
 
-if (!window.Controllers) { var Controllers = new Object(); }
-Object.extend(Controllers, {
+if (!CPSSkins.Controllers) { CPSSkins.Controllers = new Object(); }
+Object.extend(CPSSkins.Controllers, {
 
   'command': function(node, def) {
     return new CPSSkins.CommandController(node, def);
@@ -507,7 +507,7 @@
       var view = event.publisher;
       var selected = event.context;
       if (!view.def.model) {
-        var model = Canvas.getModel(selected);
+        var model = CPSSkins.Canvas.getModel(selected);
         if (model) {
           view.observe(model);
         }
@@ -526,8 +526,8 @@
 });
 
 // Identifiable DOM elements.
-if (!window.Identifiable) var Identifiable = new Object();
-Object.extend(Identifiable, {
+if (!CPSSkins.Identifiable) { CPSSkins.Identifiable = new Object() }
+Object.extend(CPSSkins.Identifiable, {
 
   isIdentifiable: function(node) {
     node = $(node);
@@ -607,13 +607,14 @@
 });
 
 
-if (!window.Canvas) { 
-  var Canvas = new Object();
-  Canvas.Styles = $({});
-  Canvas.Script = $({});
+if (!CPSSkins.Canvas) { 
+  CPSSkins.Canvas = {
+    _styles: {},
+    _scripts: {}
+  }
 }
 
-Object.extend(Canvas, {
+Object.extend(CPSSkins.Canvas, {
 
   getModel: function(node) {
     if (!node) return null;
@@ -688,7 +689,7 @@
   },
 
   addStyleSheet: function(id, src) {
-    if (id in Canvas.Styles) {
+    if (id in this._styles) {
       return;
     }
     var head = document.getElementsByTagName("head")[0];
@@ -698,12 +699,12 @@
     link.href = src;
     link.type = "text/css";
     head.appendChild(link);
-    Canvas.Styles[id] = src;
+    this._styles[id] = src;
   },
 
   removeStyleSheet: function(id) {
-    if (id in Canvas.Styles) {
-      delete Canvas.Styles[id];
+    if (id in this._styles) {
+      delete this._styles[id];
     }
     var style = document.getElementById("cpsskins-style-" + id);
     if (style) {
@@ -712,7 +713,7 @@
   },
 
   addScript: function(id, src) {
-    if (id in Canvas.Scripts) {
+    if (id in this._scripts) {
       return;
     }
     var head = document.getElementsByTagName("head")[0];
@@ -721,12 +722,12 @@
     script.href = src;
     script.type = "text/javascript";
     head.appendChild(script);
-    Canvas.Scripts[id] = src;
+    this._scripts[id] = src;
   },
 
   removeScript: function(id) {
-    if (id in Canvas.Scripts) {
-      delete Canvas.Scripts[src];
+    if (id in this._scripts) {
+      delete this._scripts[src];
     }
     var script = document.getElementById("cpsskins-script-" + id);
     if (script) {
@@ -903,7 +904,7 @@
       this.def.storage = storage_def;
     }
     var model = this;
-    var storage = Storages[storage_def.type](this);
+    var storage = CPSSkins.Storages[storage_def.type](this);
 
     // the model reacts to events on the storage and notifies observers
     CPSSkins.registerEventHandler('stored', model, function(event) {
@@ -1027,8 +1028,8 @@
 
 }
 
-if (!window.Storages) { var Storages = new Object(); }
-Object.extend(Storages, {
+if (!CPSSkins.Storages) { CPSSkins.Storages = new Object(); }
+Object.extend(CPSSkins.Storages, {
 
   ram: function(model) {
     return new CPSSkins.RAMStorage(model);
@@ -1288,18 +1289,25 @@
 }
 
 // Renderer: instanciate a widget.
-if (!window.Widgets) { var Widgets = new Object(); }
-Object.extend(Widgets, {
+if (!CPSSkins.Widgets) { CPSSkins.Widgets = new Object(); }
+
+Object.extend(CPSSkins, {
+  registerWidgets: function(widgets) {
+    Object.extend(CPSSkins.Widgets, widgets)
+  }
+});
+
+CPSSkins.registerWidgets({
 
   custom: function(def) {
-    var widget = Canvas.createNode({
+    var widget = CPSSkins.Canvas.createNode({
       tag: "div"
     });
     return new CPSSkins.CustomWidget(widget, def);
   },
 
   contextmenu: function(def) {
-    var widget = Canvas.createNode({
+    var widget = CPSSkins.Canvas.createNode({
       tag: "div",
       classes: "contextMenu",
       style: {position:"absolute", display:"none"}
@@ -1308,7 +1316,7 @@
   },
 
   contextualactions: function(def) {
-    var widget = Canvas.createNode({
+    var widget = CPSSkins.Canvas.createNode({
       tag: "div",
       classes: "contextualActions",
       style: {position:"absolute", display:"none"}
@@ -1317,7 +1325,7 @@
   },
 
   tooltip: function(def) {
-    var widget = Canvas.createNode({
+    var widget = CPSSkins.Canvas.createNode({
       tag: "div",
       classes: "tooltip",
       style: {position:"absolute", display:"none"}
@@ -1326,7 +1334,7 @@
   },
 
   panel: function(def) {
-    var widget = Canvas.createNode({
+    var widget = CPSSkins.Canvas.createNode({
       tag: "div",
       style: {display: "none"}
     });
@@ -1395,13 +1403,13 @@
     var script = data.script;
     if (script) {
       this.script_id = this.def.name;
-      Canvas.addScript(this.script_id, script);
+      CPSSkins.Canvas.addScript(this.script_id, script);
     }
 
     var css = data.css;
     if (css) {
       this.css_id = this.def.model;
-      Canvas.addStyleSheet(this.css_id, css);
+      CPSSkins.Canvas.addStyleSheet(this.css_id, css);
     }
 
     if (url) {
@@ -1426,10 +1434,10 @@
 
   teardown: function() {
     if (this.css_id) {
-      Canvas.removeStyleSheet(this.css_id);
+      CPSSkins.Canvas.removeStyleSheet(this.css_id);
     }
     if (this.script_id) {
-      Canvas.removeScript(this.script_id);
+      CPSSKins.Canvas.removeScript(this.script_id);
     }
   }
 
@@ -1505,10 +1513,10 @@
             options.attributes.disabled = true;
             options.classes.push("disabled");
           }
-          var a = Canvas.createNode(options);
+          var a = CPSSkins.Canvas.createNode(options);
 
           var icon = disabled ? "noicon.png": (item.icon || "noicon.png");
-          a.appendChild(Canvas.createNode({
+          a.appendChild(CPSSkins.Canvas.createNode({
             tag: "img",
             attributes: {
               "src": icon,
@@ -1535,10 +1543,10 @@
                 href: "javascript:void(0)"
               }
             }
-            var a = Canvas.createNode(options);
+            var a = CPSSkins.Canvas.createNode(options);
 
             var icon = disabled ? "noicon.png": (item.icon || "noicon.png");
-            a.appendChild(Canvas.createNode({
+            a.appendChild(CPSSkins.Canvas.createNode({
               tag: "img",
               attributes: {
                 "src": icon,
@@ -1553,7 +1561,7 @@
         };
 
         case "separator": {
-          var node = Canvas.createNode({
+          var node = CPSSkins.Canvas.createNode({
             tag: "div",
             classes: "separator"
           });
@@ -1570,10 +1578,10 @@
           };
 
           if (disabled) { options.classes = "disabled"; }
-          var submenuitem = container.appendChild(Canvas.createNode(options));
+          var submenuitem = 
container.appendChild(CPSSkins.Canvas.createNode(options));
 
           var icon = item.icon || "noicon.png";
-          submenuitem.appendChild(Canvas.createNode({
+          submenuitem.appendChild(CPSSkins.Canvas.createNode({
             tag: "img",
             attributes: {
               "src": icon,
@@ -1585,7 +1593,7 @@
             this.submenuLeft = Element.getDimensions(this.widget).width -2;
           }
 
-          var submenu = Canvas.createNode({
+          var submenu = CPSSkins.Canvas.createNode({
             tag: "div",
             classes: "submenu",
             style: {
@@ -1612,14 +1620,14 @@
 
     // Display the menu inside the screen
     var widget = this.widget;
-    Canvas.moveTo(widget, this.mouseX, this.mouseY);
-    Canvas.fitInsideScreen(widget);
+    CPSSkins.Canvas.moveTo(widget, this.mouseX, this.mouseY);
+    CPSSkins.Canvas.fitInsideScreen(widget);
   },
 
   /* Event handlers */
   showEvent: function(e) {
     var element = Event.element(e);
-    var selected = Identifiable.getIdentifiable(element);
+    var selected = CPSSkins.Identifiable.getIdentifiable(element);
     if (!selected) return;
 
     this.mouseX = Event.pointerX(e);
@@ -1695,8 +1703,8 @@
     if (!selected) return;
 
     var widget = this.widget;
-    Canvas.moveTo(widget, this.mouseX -50, this.mouseY);
-    Canvas.fitInsideScreen(widget);
+    CPSSkins.Canvas.moveTo(widget, this.mouseX -50, this.mouseY);
+    CPSSkins.Canvas.fitInsideScreen(widget);
   },
 
   render: function(data) {
@@ -1727,9 +1735,9 @@
         options.attributes.confirm = confirm;
       }
 
-      var a = Canvas.createNode(options);
+      var a = CPSSkins.Canvas.createNode(options);
       var icon = disabled ? "noicon.png": (item.icon || "noicon.png");
-      a.appendChild(Canvas.createNode({
+      a.appendChild(CPSSkins.Canvas.createNode({
         tag: "img",
         attributes: {
           "src": icon,
@@ -1778,14 +1786,14 @@
   prepare: function() {
     this.widget.style.top = this.mouseY + 20 + "px";
     this.widget.style.left = this.mouseX + "px";
-    Canvas.fitInsideScreen(this.widget);
+    CPSSkins.Canvas.fitInsideScreen(this.widget);
   },
 
   /* Event handlers */
   showEvent: function(e) {
     var selected = Event.element(e);
 
-    var model = Canvas.getModel(selected);
+    var model = CPSSkins.Canvas.getModel(selected);
     if (!model) return;
 
     var data = model.def.data;

Modified: 
cpsskins/branches/jmo-perspectives/ui/framework/tests/functional/cpsskins_observer_test.html
==============================================================================
--- 
cpsskins/branches/jmo-perspectives/ui/framework/tests/functional/cpsskins_observer_test.html
        (original)
+++ 
cpsskins/branches/jmo-perspectives/ui/framework/tests/functional/cpsskins_observer_test.html
        Sun Feb 19 14:01:07 2006
@@ -76,18 +76,18 @@
       model.updateData(data);
     }
 
-    Object.extend(Widgets, {
+    CPSSkins.registerWidgets({
 
-      counter: function(def) {
-        var widget = Canvas.createNode({
+      'counter': function(def) {
+        var widget = CPSSkins.Canvas.createNode({
           tag: "div",
           classes: "counter"
         });
         return new Counter(widget, def);
       },
 
-      progressbar: function(def) {
-        var widget = Canvas.createNode({
+      'progressbar': function(def) {
+        var widget = CPSSkins.Canvas.createNode({
           tag: "div",
           classes: "progressBar"
         });

Modified: 
cpsskins/branches/jmo-perspectives/ui/framework/tests/functional/tests.html
==============================================================================
--- cpsskins/branches/jmo-perspectives/ui/framework/tests/functional/tests.html 
(original)
+++ cpsskins/branches/jmo-perspectives/ui/framework/tests/functional/tests.html 
Sun Feb 19 14:01:07 2006
@@ -34,7 +34,7 @@
   </li>
   <li>
     <a target="main"
-       href="cpsskins_widget_templates.html">Widget templates</a>
+       href="cpsskins_widget_template_test.html">Widget templates</a>
   </li>
   <li>
     <a target="main"

Modified: 
cpsskins/branches/jmo-perspectives/ui/framework/tests/unit/cpsskins_test.html
==============================================================================
--- 
cpsskins/branches/jmo-perspectives/ui/framework/tests/unit/cpsskins_test.html   
    (original)
+++ 
cpsskins/branches/jmo-perspectives/ui/framework/tests/unit/cpsskins_test.html   
    Sun Feb 19 14:01:07 2006
@@ -263,72 +263,72 @@
 
     /* Identifiable */
     testIsIdentifiable: function() { with(this) {
-      assertEqual(Identifiable.isIdentifiable(e1), true);
-      assertEqual(Identifiable.isIdentifiable(e1.parentNode), false);
+      assertEqual(CPSSkins.Identifiable.isIdentifiable(e1), true);
+      assertEqual(CPSSkins.Identifiable.isIdentifiable(e1.parentNode), false);
     }},
 
     testGetOrder: function() { with(this) {
-      assertEqual(Identifiable.getOrder(e1), 0);
-      assertEqual(Identifiable.getOrder(e2), 0);
-      assertEqual(Identifiable.getOrder(e3), 1);
-      assertEqual(Identifiable.getOrder(e4), 2);
-      assertEqual(Identifiable.getOrder(e5), 0);
-      assertEqual(Identifiable.getOrder(e6), 1);
+      assertEqual(CPSSkins.Identifiable.getOrder(e1), 0);
+      assertEqual(CPSSkins.Identifiable.getOrder(e2), 0);
+      assertEqual(CPSSkins.Identifiable.getOrder(e3), 1);
+      assertEqual(CPSSkins.Identifiable.getOrder(e4), 2);
+      assertEqual(CPSSkins.Identifiable.getOrder(e5), 0);
+      assertEqual(CPSSkins.Identifiable.getOrder(e6), 1);
     }},
 
     testGetNext: function() { with(this) {
-      assertEqual(Identifiable.getNext(e1), e6);
-      assertEqual(Identifiable.getNext(e2), e3);
-      assertEqual(Identifiable.getNext(e3), e4);
-      assertEqual(Identifiable.getNext(e4), null);
-      assertEqual(Identifiable.getNext(e5), null);
-      assertEqual(Identifiable.getNext(e6), null);
+      assertEqual(CPSSkins.Identifiable.getNext(e1), e6);
+      assertEqual(CPSSkins.Identifiable.getNext(e2), e3);
+      assertEqual(CPSSkins.Identifiable.getNext(e3), e4);
+      assertEqual(CPSSkins.Identifiable.getNext(e4), null);
+      assertEqual(CPSSkins.Identifiable.getNext(e5), null);
+      assertEqual(CPSSkins.Identifiable.getNext(e6), null);
     }},
 
     testGetPrevious: function() { with(this) {
-      assertEqual(Identifiable.getPrevious(e6), e1);
-      assertEqual(Identifiable.getPrevious(e3), e2);
-      assertEqual(Identifiable.getPrevious(e4), e3);
-      assertEqual(Identifiable.getPrevious(e5), null);
-      assertEqual(Identifiable.getPrevious(e2), null);
-      assertEqual(Identifiable.getPrevious(e1), null);
+      assertEqual(CPSSkins.Identifiable.getPrevious(e6), e1);
+      assertEqual(CPSSkins.Identifiable.getPrevious(e3), e2);
+      assertEqual(CPSSkins.Identifiable.getPrevious(e4), e3);
+      assertEqual(CPSSkins.Identifiable.getPrevious(e5), null);
+      assertEqual(CPSSkins.Identifiable.getPrevious(e2), null);
+      assertEqual(CPSSkins.Identifiable.getPrevious(e1), null);
     }},
 
     testGetParent: function() { with(this) {
-      assertEqual(Identifiable.getParent(e1), e0);
-      assertEqual(Identifiable.getParent(e2), e0);
-      assertEqual(Identifiable.getParent(e3), e0);
-      assertEqual(Identifiable.getParent(e4), e0);
-      assertEqual(Identifiable.getParent(e5), e4);
-      assertEqual(Identifiable.getParent(e6), e0);
+      assertEqual(CPSSkins.Identifiable.getParent(e1), e0);
+      assertEqual(CPSSkins.Identifiable.getParent(e2), e0);
+      assertEqual(CPSSkins.Identifiable.getParent(e3), e0);
+      assertEqual(CPSSkins.Identifiable.getParent(e4), e0);
+      assertEqual(CPSSkins.Identifiable.getParent(e5), e4);
+      assertEqual(CPSSkins.Identifiable.getParent(e6), e0);
     }},
 
     testGetIdentifiable: function() { with(this) {
-      assertEqual(Identifiable.getIdentifiable(e1), e1);
-      assertEqual(Identifiable.getIdentifiable(e2), e2);
-      assertEqual(Identifiable.getIdentifiable(e1.parentNode),
+      assertEqual(CPSSkins.Identifiable.getIdentifiable(e1), e1);
+      assertEqual(CPSSkins.Identifiable.getIdentifiable(e2), e2);
+      assertEqual(CPSSkins.Identifiable.getIdentifiable(e1.parentNode),
                   e0);
     }},
 
     testIsEmpty: function() { with(this) {
-      assertEqual(Identifiable.isEmpty(e0), false);
-      assertEqual(Identifiable.isEmpty(e1), true);
-      assertEqual(Identifiable.isEmpty(e2), true);
-      assertEqual(Identifiable.isEmpty(e3), true);
-      assertEqual(Identifiable.isEmpty(e4), false);
-      assertEqual(Identifiable.isEmpty(e5), true);
-      assertEqual(Identifiable.isEmpty(e6), true);
+      assertEqual(CPSSkins.Identifiable.isEmpty(e0), false);
+      assertEqual(CPSSkins.Identifiable.isEmpty(e1), true);
+      assertEqual(CPSSkins.Identifiable.isEmpty(e2), true);
+      assertEqual(CPSSkins.Identifiable.isEmpty(e3), true);
+      assertEqual(CPSSkins.Identifiable.isEmpty(e4), false);
+      assertEqual(CPSSkins.Identifiable.isEmpty(e5), true);
+      assertEqual(CPSSkins.Identifiable.isEmpty(e6), true);
     }},
 
-    /* Canvas */
+    /* CPSSkins.Canvas */
 
     testCreateNode: function() { with(this) {
-      var n1 = Canvas.createNode({
+      var n1 = CPSSkins.Canvas.createNode({
         tag: "div"
       });
       assertEqual(n1.tagName.toLowerCase(), "div");
 
-      var n2 = Canvas.createNode({
+      var n2 = CPSSkins.Canvas.createNode({
         tag: "a",
         attributes: {
           "href": "http://someurl.html/";
@@ -337,7 +337,7 @@
       assertEqual(n2.tagName.toLowerCase(), "a");
       assertEqual(n2.getAttribute("href"), "http://someurl.html/";);
 
-      var n3 = Canvas.createNode({
+      var n3 = CPSSkins.Canvas.createNode({
         tag: "span",
         classes: "cssClass",
         style: {position: "absolute", display: "none"}
@@ -347,7 +347,7 @@
       assertEqual(n3.style.display, "none");
       assert(Element.hasClassName(n3, "cssClass"));
 
-      var n4 = Canvas.createNode({
+      var n4 = CPSSkins.Canvas.createNode({
         tag: "p",
         text: "Some text"
       });
@@ -355,28 +355,28 @@
     }},
 
     testGetModelNode: function() { with(this) {
-      assertEqual(Canvas._getModelNode(e0), null);
-      assertEqual(Canvas._getModelNode(e1), null);
-      assertNotEqual(Canvas._getModelNode(e2), null);
-      assertEqual(Canvas._getModelNode(e3), null);
-      assertEqual(Canvas._getModelNode(e4), null);
-      assertEqual(Canvas._getModelNode(e5), null);
-      assertNotEqual(Canvas._getModelNode(e6), null);
+      assertEqual(CPSSkins.Canvas._getModelNode(e0), null);
+      assertEqual(CPSSkins.Canvas._getModelNode(e1), null);
+      assertNotEqual(CPSSkins.Canvas._getModelNode(e2), null);
+      assertEqual(CPSSkins.Canvas._getModelNode(e3), null);
+      assertEqual(CPSSkins.Canvas._getModelNode(e4), null);
+      assertEqual(CPSSkins.Canvas._getModelNode(e5), null);
+      assertNotEqual(CPSSkins.Canvas._getModelNode(e6), null);
     }},
 
     testGetModel: function() { with(this) {
-      assertEqual(Canvas.getModel(e0), null);
-      assertEqual(Canvas.getModel(e1), null);
-      assertNotEqual(Canvas.getModel(e2), null);
-      assertEqual(Canvas.getModel(e3), null);
-      assertEqual(Canvas.getModel(e4), null);
-      assertEqual(Canvas.getModel(e5), null);
-      assertNotEqual(Canvas.getModel(e6), null);
+      assertEqual(CPSSkins.Canvas.getModel(e0), null);
+      assertEqual(CPSSkins.Canvas.getModel(e1), null);
+      assertNotEqual(CPSSkins.Canvas.getModel(e2), null);
+      assertEqual(CPSSkins.Canvas.getModel(e3), null);
+      assertEqual(CPSSkins.Canvas.getModel(e4), null);
+      assertEqual(CPSSkins.Canvas.getModel(e5), null);
+      assertNotEqual(CPSSkins.Canvas.getModel(e6), null);
     }},
 
     testGetData: function() { with(this) {
-      var model_e2 = Canvas.getModel(e2);
-      var model_e6 = Canvas.getModel(e6);
+      var model_e2 = CPSSkins.Canvas.getModel(e2);
+      var model_e6 = CPSSkins.Canvas.getModel(e6);
 
       assertEqual($H(model_e2.getData()).inspect(),
                   $H({a:"1", b:"2", c: true}).inspect());
@@ -386,7 +386,7 @@
     }},
 
     testSetData: function() { with(this) {
-      var model_e2 = Canvas.getModel(e2);
+      var model_e2 = CPSSkins.Canvas.getModel(e2);
 
       assertEqual($H(model_e2.schema).inspect(),
                   $H({'a': 'string', 'b': 'string', 'c': 
'boolean'}).inspect());
@@ -411,7 +411,7 @@
     }},
 
     testUpdateData: function() { with(this) {
-      var model_e2 = Canvas.getModel(e2);
+      var model_e2 = CPSSkins.Canvas.getModel(e2);
 
       model_e2.setData({"a": "1", "b": "2", "c": true});
       assertEqual($H(model_e2.getData()).inspect(),

Modified: 
cpsskins/branches/jmo-perspectives/ui/framework/tests/zope3/functional/latency/cpsskins_latency.pt
==============================================================================
--- 
cpsskins/branches/jmo-perspectives/ui/framework/tests/zope3/functional/latency/cpsskins_latency.pt
  (original)
+++ 
cpsskins/branches/jmo-perspectives/ui/framework/tests/zope3/functional/latency/cpsskins_latency.pt
  Sun Feb 19 14:01:07 2006
@@ -55,7 +55,7 @@
       });
     }
 
-    Object.extend(Widgets, {
+    CPSSkins.registerWidgets({
 
       counter: function(def) {
         var widget = Canvas.createNode({

Modified: 
cpsskins/branches/jmo-perspectives/ui/framework/tests/zope3/functional/latency/cpsskins_typewriter.pt
==============================================================================
--- 
cpsskins/branches/jmo-perspectives/ui/framework/tests/zope3/functional/latency/cpsskins_typewriter.pt
       (original)
+++ 
cpsskins/branches/jmo-perspectives/ui/framework/tests/zope3/functional/latency/cpsskins_typewriter.pt
       Sun Feb 19 14:01:07 2006
@@ -69,7 +69,7 @@
 
     }
 
-    Object.extend(Widgets, {
+    CPSSkins.registerWidgets({
 
       typewriter: function(def) {
         var widget = Canvas.createNode({
@@ -78,6 +78,7 @@
         });
         return new TypeWriter(widget, def);
       },
+
     });
 
     TypeWriter = Class.create();

Modified: 
cpsskins/branches/jmo-perspectives/ui/framework/tests/zope3/functional/quiz/cpsskins_quiz.pt
==============================================================================
--- 
cpsskins/branches/jmo-perspectives/ui/framework/tests/zope3/functional/quiz/cpsskins_quiz.pt
        (original)
+++ 
cpsskins/branches/jmo-perspectives/ui/framework/tests/zope3/functional/quiz/cpsskins_quiz.pt
        Sun Feb 19 14:01:07 2006
@@ -53,7 +53,7 @@
 
   <script type="text/javascript">
 
-    Object.extend(Widgets, {
+    CPSSkins.registerWidgets({
 
       inputbox: function(def) {
         var widget = Canvas.createNode({
-- 
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins

Reply via email to