Author: jmorliaguet Date: Sat Feb 18 14:50:35 2006 New Revision: 2414 Added: cpsskins/branches/jmo-perspectives/ui/framework/tests/functional/treeview/ Modified: cpsskins/branches/jmo-perspectives/ui/framework/cpsskins.js cpsskins/branches/jmo-perspectives/ui/framework/tests/functional/cpsskins_contextualactions_test.html cpsskins/branches/jmo-perspectives/ui/framework/tests/functional/cpsskins_contextualmenu_test.html cpsskins/branches/jmo-perspectives/ui/framework/tests/unit/cpsskins_test.html cpsskins/branches/jmo-perspectives/ui/framework/tests/zope3/functional/chat/cpsskins_chat.pt cpsskins/branches/jmo-perspectives/ui/framework/tests/zope3/functional/quiz/cpsskins_quiz.pt cpsskins/branches/jmo-perspectives/ui/framework/tests/zope3/functional/treeview/cpsskins_treeview.pt cpsskins/branches/jmo-perspectives/ui/framework/tests/zope3/unit/cpsskins_storage_adapters.pt Log:
- renamed 'compound storage' as 'unified storage' and 'partitions' as 'units' 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 Sat Feb 18 14:50:35 2006 @@ -1044,8 +1044,8 @@ return new CPSSkins.RemoteStorage(model); }, - compound: function(model) { - return new CPSSkins.CompoundStorage(model); + unified: function(model) { + return new CPSSkins.UnifiedStorage(model); } }); @@ -1138,8 +1138,8 @@ }); -CPSSkins.CompoundStorage = Class.create(); -CPSSkins.CompoundStorage.prototype = Object.extend( +CPSSkins.UnifiedStorage = Class.create(); +CPSSkins.UnifiedStorage.prototype = Object.extend( new CPSSkins.StorageAdapter(), { setup: function() { @@ -1153,7 +1153,7 @@ CPSSkins.notify('stored', {'publisher': storage}); }); - $A(this.model.def.storage.partitions).each(function(p) { + $A(this.model.def.storage.units).each(function(p) { var model = CPSSkins.getModelById(p); models.push(model); CPSSkins.subscribe('stored', Modified: cpsskins/branches/jmo-perspectives/ui/framework/tests/functional/cpsskins_contextualactions_test.html ============================================================================== --- cpsskins/branches/jmo-perspectives/ui/framework/tests/functional/cpsskins_contextualactions_test.html (original) +++ cpsskins/branches/jmo-perspectives/ui/framework/tests/functional/cpsskins_contextualactions_test.html Sat Feb 18 14:50:35 2006 @@ -110,9 +110,9 @@ <!-- Controller --> <script type="text/javascript"> - function displayChoice(info) { - var context = info.context; - var options = info.options; + function displayChoice(event) { + var context = event.context; + var options = event.options; $("message").innerHTML += context.getAttribute('id') + ' => ' + options.choice + '\n'; Modified: cpsskins/branches/jmo-perspectives/ui/framework/tests/functional/cpsskins_contextualmenu_test.html ============================================================================== --- cpsskins/branches/jmo-perspectives/ui/framework/tests/functional/cpsskins_contextualmenu_test.html (original) +++ cpsskins/branches/jmo-perspectives/ui/framework/tests/functional/cpsskins_contextualmenu_test.html Sat Feb 18 14:50:35 2006 @@ -170,9 +170,9 @@ <!-- Controller --> <script type="text/javascript"> - function displayChoice(info) { - var context = info.context; - var options = info.options; + function displayChoice(event) { + var context = event.context; + var options = event.options; $("message").innerHTML += context.getAttribute('id') + ' => ' + options.choice + '\n'; } 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 Sat Feb 18 14:50:35 2006 @@ -188,7 +188,7 @@ } </ins> - <!-- compound storages --> + <!-- unified storages --> <ins class="model"> {"id": "m1", "data": {"a": 1}, @@ -209,8 +209,8 @@ {"id": "c1", "data": {"a": 0, "b": 0}, "storage": { - "type": "compound", - "partitions": ["m1", "m2"] + "type": "unified", + "units": ["m1", "m2"] }} </ins> @@ -422,14 +422,14 @@ $H({"a": "2", "c":true}).inspect()); }}, - testCompoundStoragesGetData: function() { with(this) { + testUnifiedStoragesGetData: function() { with(this) { var model_c1 = CPSSkins.getModelById('c1'); assertEqual($H(model_c1.getData()).inspect(), $H({"a": 1,"b": 2}).inspect()); }}, - testCompoundStoragesSetData: function() { with(this) { + testUnifiedStoragesSetData: function() { with(this) { var model_m1 = CPSSkins.getModelById('m1'); var model_m2 = CPSSkins.getModelById('m2'); var model_c1 = CPSSkins.getModelById('c1'); Modified: cpsskins/branches/jmo-perspectives/ui/framework/tests/zope3/functional/chat/cpsskins_chat.pt ============================================================================== --- cpsskins/branches/jmo-perspectives/ui/framework/tests/zope3/functional/chat/cpsskins_chat.pt (original) +++ cpsskins/branches/jmo-perspectives/ui/framework/tests/zope3/functional/chat/cpsskins_chat.pt Sat Feb 18 14:50:35 2006 @@ -102,8 +102,8 @@ "messages": [] }, "storage": { - "type": "compound", - "partitions": ["messages", "status", "input"] + "type": "unified", + "units": ["messages", "status", "input"] } }} </ins> @@ -116,8 +116,8 @@ "user": "Guest" }, "storage": { - "type": "compound", - "partitions": ["status", "input", "user"] + "type": "unified", + "units": ["status", "input", "user"] } }} </ins> 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 Sat Feb 18 14:50:35 2006 @@ -127,7 +127,7 @@ <li><a href="#ram">RAM</a></li> <li><a href="#local">Local</a> (stores the data in cookies)</li> <li><a href="#remote">Remote</a> (accesses a remote server)</li> - <li><a href="#compound">Compound</a> (a combination of several storages)</li> + <li><a href="#unified">Unified</a> (a combination of several storages)</li> </ul> <ins class="controller"> @@ -264,10 +264,10 @@ </div> - <a name="compound"></a> - <h2>Compound storage</h2> + <a name="unified"></a> + <h2>Unified storage</h2> - <p>A compound storage is created by combining the storages of + <p>A unified storage is created by combining the storages of different models.</p> <p>In this example there are two storages:</p> @@ -277,7 +277,7 @@ message from the server's side.</li> </ul> - <p>Both storages are combined into a unique <strong>compound storage</strong>. + <p>Both storages are combined into a unique <strong>unified storage</strong>. </p> <p>Hence the view (input box widget) still observes a unique model. @@ -313,14 +313,14 @@ </ins> <ins class="model"> - {"id": "compound-data-provider", + {"id": "unified-data-provider", "data": { "message": "", "content": "" }, "storage": { - "type": "compound", - "partitions": ["message", "content"] + "type": "unified", + "units": ["message", "content"] }} </ins> @@ -328,7 +328,7 @@ {"widget": { "type": "inputbox" }, - "model": "compound-data-provider", + "model": "unified-data-provider", "controllers": ["controller"] } </ins> Modified: cpsskins/branches/jmo-perspectives/ui/framework/tests/zope3/functional/treeview/cpsskins_treeview.pt ============================================================================== --- cpsskins/branches/jmo-perspectives/ui/framework/tests/zope3/functional/treeview/cpsskins_treeview.pt (original) +++ cpsskins/branches/jmo-perspectives/ui/framework/tests/zope3/functional/treeview/cpsskins_treeview.pt Sat Feb 18 14:50:35 2006 @@ -104,8 +104,8 @@ "items": [] }, "storage": { - "type": "compound", - "partitions": ["tree-state", "tree-data"] + "type": "unified", + "units": ["tree-state", "tree-data"] } }} </ins> Modified: cpsskins/branches/jmo-perspectives/ui/framework/tests/zope3/unit/cpsskins_storage_adapters.pt ============================================================================== --- cpsskins/branches/jmo-perspectives/ui/framework/tests/zope3/unit/cpsskins_storage_adapters.pt (original) +++ cpsskins/branches/jmo-perspectives/ui/framework/tests/zope3/unit/cpsskins_storage_adapters.pt Sat Feb 18 14:50:35 2006 @@ -29,7 +29,7 @@ <!-- Testing area --> <div id="e0"> - <!-- compound storages --> + <!-- unified storages --> <ins class="model"> {"id": "m1", "data": {"a": 1}, @@ -63,8 +63,8 @@ {"id": "c1", "data": {"a": 0, "b": 0, "c": 0}, "storage": { - "type": "compound", - "partitions": ["m1", "m2", "m3"] + "type": "unified", + "units": ["m1", "m2", "m3"] }} </ins> -- http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins