[Commits] r2715 - in sandbox/redlining/ux/FeatureEditing/ux: . data widgets/form

[commits at geoext.org]

Author: pgiraud
Date: 2011-05-23 10:07:31 +0200 (Mon, 23 May 2011)
New Revision: 2715

Removed:
   sandbox/redlining/ux/FeatureEditing/ux/util/
Modified:
   sandbox/redlining/ux/FeatureEditing/ux/FeatureEditing.js
   sandbox/redlining/ux/FeatureEditing/ux/data/FeatureEditingDefaultStyleStore.js
   sandbox/redlining/ux/FeatureEditing/ux/widgets/form/FeaturePanel.js
Log:
Use a factory for the colors combo store to prevent problems with localization and files loading order (ie. OpenLayers.setLang() called too late), we don't need any clone util anymore

Modified: sandbox/redlining/ux/FeatureEditing/ux/FeatureEditing.js
===================================================================
--- sandbox/redlining/ux/FeatureEditing/ux/FeatureEditing.js	2011-05-20 09:21:13 UTC (rev 2714)
+++ sandbox/redlining/ux/FeatureEditing/ux/FeatureEditing.js	2011-05-23 08:07:31 UTC (rev 2715)
@@ -57,7 +57,6 @@
         "widgets/form/RedLiningPanel.js",
         "widgets/form/FeaturePanel.js",
         "data/FeatureEditingDefaultStyleStore.js",
-        "util/Clone.js",
 
         "widgets/plugins/ImportFeatures.js",
         "widgets/plugins/ExportFeatures.js",

Modified: sandbox/redlining/ux/FeatureEditing/ux/data/FeatureEditingDefaultStyleStore.js
===================================================================
--- sandbox/redlining/ux/FeatureEditing/ux/data/FeatureEditingDefaultStyleStore.js	2011-05-20 09:21:13 UTC (rev 2714)
+++ sandbox/redlining/ux/FeatureEditing/ux/data/FeatureEditingDefaultStyleStore.js	2011-05-23 08:07:31 UTC (rev 2715)
@@ -1,28 +1,30 @@
 Ext.namespace("GeoExt.ux.data");
 
-GeoExt.ux.data.FeatureEditingDefaultStyleStoreOptions = {
-    fields: ['name', 'style'],
-    data: [
-        [OpenLayers.i18n('blue'), {fillColor: 'blue', strokeColor: 'blue'}], 
-        [OpenLayers.i18n('red'), {fillColor: 'red', strokeColor: 'red'}], 
-        [OpenLayers.i18n('green'), {fillColor: 'green', strokeColor: 'green'}], 
-        [OpenLayers.i18n('yellow'), {fillColor: 'yellow', strokeColor: 'yellow'}],
-        [OpenLayers.i18n('orange'), {fillColor: '#FFA500', strokeColor: '#FFA500'}],
-        [OpenLayers.i18n('purple'), {fillColor: 'purple', strokeColor: 'purple'}],
-        [OpenLayers.i18n('white'), {fillColor: 'white', strokeColor: 'white'}],
-        [OpenLayers.i18n('black'), {fillColor: 'black', strokeColor: 'black'}],
-        [OpenLayers.i18n('gray'), {fillColor: 'gray', strokeColor: 'gray'}],
-        [OpenLayers.i18n('pink'), {fillColor: '#FFC0CB', strokeColor: '#FFC0CB'}],
-        [OpenLayers.i18n('brown'), {fillColor: '#A52A2A', strokeColor: '#A52A2A'}],
-        [OpenLayers.i18n('cyan'), {fillColor: '#00FFFF', strokeColor: '#00FFFF'}],
-        [OpenLayers.i18n('lime'), {fillColor: 'lime', strokeColor: 'lime'}],
-        [OpenLayers.i18n('indigo'), {fillColor: '#4B0082', strokeColor: '#4B0082'}],
-        [OpenLayers.i18n('magenta'), {fillColor: '#FF00FF', strokeColor: '#FF00FF'}],
-        [OpenLayers.i18n('maroon'), {fillColor: 'maroon', strokeColor: 'maroon'}],
-        [OpenLayers.i18n('olive'), {fillColor: 'olive', strokeColor: 'olive'}],
-        [OpenLayers.i18n('plum'), {fillColor: '#DDA0DD', strokeColor: '#DDA0DD'}],
-        [OpenLayers.i18n('salmon'), {fillColor: '#FA8072', strokeColor: '#FA8072'}],
-        [OpenLayers.i18n('gold'), {fillColor: '#FFD700', strokeColor: '#FFD700'}],
-        [OpenLayers.i18n('silver'), {fillColor: 'silver', strokeColor: 'silver'}]
-    ]
+GeoExt.ux.data.getFeatureEditingDefaultStyleStoreOptions = function() {
+    return {
+        fields: ['name', 'style'],
+        data: [
+            [OpenLayers.i18n('blue'), {fillColor: 'blue', strokeColor: 'blue'}], 
+            [OpenLayers.i18n('red'), {fillColor: 'red', strokeColor: 'red'}], 
+            [OpenLayers.i18n('green'), {fillColor: 'green', strokeColor: 'green'}], 
+            [OpenLayers.i18n('yellow'), {fillColor: 'yellow', strokeColor: 'yellow'}],
+            [OpenLayers.i18n('orange'), {fillColor: '#FFA500', strokeColor: '#FFA500'}],
+            [OpenLayers.i18n('purple'), {fillColor: 'purple', strokeColor: 'purple'}],
+            [OpenLayers.i18n('white'), {fillColor: 'white', strokeColor: 'white'}],
+            [OpenLayers.i18n('black'), {fillColor: 'black', strokeColor: 'black'}],
+            [OpenLayers.i18n('gray'), {fillColor: 'gray', strokeColor: 'gray'}],
+            [OpenLayers.i18n('pink'), {fillColor: '#FFC0CB', strokeColor: '#FFC0CB'}],
+            [OpenLayers.i18n('brown'), {fillColor: '#A52A2A', strokeColor: '#A52A2A'}],
+            [OpenLayers.i18n('cyan'), {fillColor: '#00FFFF', strokeColor: '#00FFFF'}],
+            [OpenLayers.i18n('lime'), {fillColor: 'lime', strokeColor: 'lime'}],
+            [OpenLayers.i18n('indigo'), {fillColor: '#4B0082', strokeColor: '#4B0082'}],
+            [OpenLayers.i18n('magenta'), {fillColor: '#FF00FF', strokeColor: '#FF00FF'}],
+            [OpenLayers.i18n('maroon'), {fillColor: 'maroon', strokeColor: 'maroon'}],
+            [OpenLayers.i18n('olive'), {fillColor: 'olive', strokeColor: 'olive'}],
+            [OpenLayers.i18n('plum'), {fillColor: '#DDA0DD', strokeColor: '#DDA0DD'}],
+            [OpenLayers.i18n('salmon'), {fillColor: '#FA8072', strokeColor: '#FA8072'}],
+            [OpenLayers.i18n('gold'), {fillColor: '#FFD700', strokeColor: '#FFD700'}],
+            [OpenLayers.i18n('silver'), {fillColor: 'silver', strokeColor: 'silver'}]
+        ]
+    }
 };

Modified: sandbox/redlining/ux/FeatureEditing/ux/widgets/form/FeaturePanel.js
===================================================================
--- sandbox/redlining/ux/FeatureEditing/ux/widgets/form/FeaturePanel.js	2011-05-20 09:21:13 UTC (rev 2714)
+++ sandbox/redlining/ux/FeatureEditing/ux/widgets/form/FeaturePanel.js	2011-05-23 08:07:31 UTC (rev 2715)
@@ -205,8 +205,8 @@
                 break;
             }
 
-            var styleStore = new Ext.data.SimpleStore(Ext.ux.util.clone(
-                GeoExt.ux.data.FeatureEditingDefaultStyleStoreOptions));
+            var styleStore = new Ext.data.SimpleStore(
+                GeoExt.ux.data.getFeatureEditingDefaultStyleStoreOptions());
             styleStore.sort('name');
             var styler = new GeoExt.ux.LayerStyleManager(
                 new GeoExt.ux.StyleSelectorComboBox({