Author: jmorliaguet Date: Wed Mar 1 22:00:57 2006 New Revision: 2503 Modified: cpsskins/branches/jmo-perspectives/ui/framework/cpsskins.js Log:
- we use 'this._xyz' instead of 'CPSSkins._xyz' for private variables and methods. 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 Wed Mar 1 22:00:57 2006 @@ -55,7 +55,7 @@ getModelById: function(id) { var model = null; - CPSSkins._models.each(function(m) { + this._models.each(function(m) { var def = m.value.def; if (def.id == id) { model = m.value @@ -66,7 +66,7 @@ getControllerById: function(id) { var controller = null; - CPSSkins._controllers.each(function(c) { + this._controllers.each(function(c) { var def = c.value.def; if (def.id == id) { controller = c.value; @@ -76,19 +76,19 @@ }, registerControllers: function(controllers) { - Object.extend(CPSSkins.Controllers, controllers) + Object.extend(this.Controllers, controllers) }, registerEffects: function(effects) { - Object.extend(CPSSkins.Effects, effects) + Object.extend(this.Effects, effects) }, registerStorages: function(storages) { - Object.extend(CPSSkins.Storages, storages) + Object.extend(this.Storages, storages) }, registerWidgets: function(widgets) { - Object.extend(CPSSkins.Widgets, widgets) + Object.extend(this.Widgets, widgets) }, /* Error handling */ @@ -101,19 +101,19 @@ /* Action handlers */ addActions: function(handlers) { - Object.extend(CPSSkins._handlers, handlers); + Object.extend(this._handlers, handlers); }, /* Event system */ subscribe: function(eventid, event) { - if (!(eventid in CPSSkins._subscribers)) { - CPSSkins._subscribers[eventid] = []; + if (!(eventid in this._subscribers)) { + this._subscribers[eventid] = []; } - CPSSkins._subscribers[eventid].push(event); + this._subscribers[eventid].push(event); }, unsubscribe: function(eventid, event) { - var subscribers = CPSSkins._subscribers; + var subscribers = this._subscribers; if (!(eventid in subscribers)) { return; } subscribers[eventid] = subscribers[eventid].reject(function(e) { if (event == undefined) return true; @@ -124,7 +124,7 @@ }, notify: function(eventid, event) { - var subscribers = CPSSkins._subscribers; + var subscribers = this._subscribers; var publisher = event.publisher; (subscribers[eventid] || []).findAll(function(e) { return (e.publisher == publisher || e.publisher == null) @@ -169,17 +169,17 @@ // first stage _parse: function(node) { var elements = $A(node.getElementsByTagName("ins")); - CPSSkins._initialized = 0; + this._initialized = 0; var length = elements.length; var progress = new Object(); - CPSSkins.registerEventHandler("initialized", progress, function(event) { - CPSSkins._initialized += 1; - if (CPSSkins._initialized >= length) { - CPSSkins._load(node); - CPSSkins.unsubscribe("initialized"); + this.registerEventHandler("initialized", progress, function(event) { + this._initialized += 1; + if (this._initialized >= length) { + this._load(node); + this.unsubscribe("initialized"); } - }); + }.bind(this)); CPSSkins.subscribe("initialized", {'subscriber': progress}); elements.each(function(el) { @@ -210,29 +210,29 @@ ["view", "controller", "model"].each(function(type) { elements.each(function(el) { if (Element.hasClassName(el, type)) { - CPSSkins._register(el, type, CPSSkins._loaded); - CPSSkins._loaded += 1; + this._register(el, type, this._loaded); + this._loaded += 1; } - }); - }); + }.bind(this)); + }.bind(this)); }, _register: function(el, classid, index) { // make the element identifiable var name = classid + index; el.setAttribute("name", name); - var def = CPSSkins._jsonParse(el); + var def = this._jsonParse(el); def.name = name; switch(classid) { case "controller": { var controller_type = def.type || "command"; - var factory = CPSSkins.Controllers[controller_type]; + var factory = this.Controllers[controller_type]; if (factory) { var controller = factory(el, def); controller.setup(); - CPSSkins._controllers[name] = controller; + this._controllers[name] = controller; CPSSkins.notify("registered controller " + def.id, {'publisher': controller}); } @@ -241,7 +241,7 @@ case "model": { var model = new CPSSkins.Model(el, def); - CPSSkins._models[name] = model; + this._models[name] = model; CPSSkins.notify("registered model " + def.id, {'publisher': model}); break; } @@ -258,12 +258,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 CPSSkins.Widgets)) { + } else if (!(widget_type in this.Widgets)) { CPSSkins.warn("Unknown widget type: " + widget_type, el); } } - factory = CPSSkins.Widgets[widget_type]; + factory = this.Widgets[widget_type]; view = factory(def); /* create the view */ -- http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins