Author: jmorliaguet
Date: Mon Jan 9 23:08:41 2006
New Revision: 2202
Modified:
cpsskins/branches/jmo-perspectives/ui/framework/cpsskins.js
cpsskins/branches/jmo-perspectives/ui/framework/tests/functional/cpsskins_observer_test.html
Log:
- "observe" / "observed" is now called "model", i.e. the "view's model"
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 Mon Jan 9
23:08:41 2006
@@ -54,30 +54,30 @@
CPSSkins.Perspectives[p].push(view);
});
- var observed = e.getAttribute("observe");
- if (observed) {
- CPSSkins.addObserver(observed, view)
+ var model = e.getAttribute("model");
+ if (model) {
+ CPSSkins.addObserver(model, view)
}
}
});
},
- addObserver: function(observed, view) {
- observed = $(observed);
- if (!(observed in CPSSkins.Observers)) {
- CPSSkins.Observers[observed] = $A([]);
+ addObserver: function(model, view) {
+ model = $(model);
+ if (!(model in CPSSkins.Observers)) {
+ CPSSkins.Observers[model] = $A([]);
}
- CPSSkins.Observers[observed].push(view);
- view.observed = observed;
+ CPSSkins.Observers[model].push(view);
+ view.model = model;
view.update();
},
removeObserver: function(view) {
- var observed = view.observed;
- if (observed) {
- var observers = CPSSkins.Observers[observed];
+ var model = view.model;
+ if (model) {
+ var observers = CPSSkins.Observers[model];
observers = observers.without(view);
}
},
@@ -451,11 +451,11 @@
this.controller = null;
}
- var observed = tag.getAttribute("observe");
- if (observed) {
- this.observed = $(observed);
+ var model = tag.getAttribute("model");
+ if (model) {
+ this.model = $(model);
} else {
- this.observed = null;
+ this.model = null;
}
this.effects = (tag.getAttribute("effects") || "").split(",");
@@ -486,18 +486,18 @@
/* Private API */
- handleAction: function(object, action, param) {
+ handleAction: function(object, action, args) {
var controller = this.controller;
if (!controller) return;
var handler = controller.handlers[action];
if (handler) {
- handler(object, param);
+ handler(object, args);
}
},
getData: function() {
- if (this.observed) {
- return Canvas.getNodeData(this.observed);
+ if (this.model) {
+ return Canvas.getNodeData(this.model);
}
return null;
},
@@ -823,7 +823,7 @@
Canvas.fitInsideScreen(widget);
// TODO: move this elsewhere
- if (!this.tag.getAttribute("observe")) {
+ if (!this.tag.getAttribute("model")) {
CPSSkins.addObserver(selected, this);
}
},
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
Mon Jan 9 23:08:41 2006
@@ -138,16 +138,16 @@
</div>
<h2>progress bar widget</h2>
- <view widget="progressbar" observe="data-provider"></view>
+ <view widget="progressbar" model="data-provider"></view>
<h2>counter widget</h2>
- <view widget="counter" observe="data-provider"></view>
+ <view widget="counter" model="data-provider"></view>
<h2>menu widget</h2>
<div id="info">
Info
<!-- menu view observing the data provider -->
- <view widget="contextmenu" observe="data-provider">
+ <view widget="contextmenu" model="data-provider">
<items choices="sizeinfo"></items>
</view>
</div>
--
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins
