Changeset 12847

Timestamp:

03/03/08 15:54:55 (9 months ago)

Author:

sorvell

Message:

!strict fixes #5405 dojox.grid.editors.Select now accepts 0 as a value property. Previously, the the values property was not properly used. This has also been repaired.

Location:

dojox/trunk/grid

Files:

• tests/test_edit.html (modified) (2 diffs)
• _data/editors.js (modified) (1 diff)

dojox/trunk/grid/tests/test_edit.html

@@ -67 +67 @@
         // ==========================================================================
         data = [ 
-                [ "normal", false, "new", 'But are not followed by two hexadecimal', 29.91, 10, false ],
-                [ "important", false, "new", 'Because a % sign always indicates', 9.33, -5, false ],
-                [ "important", false, "read", 'Signs can be selectively', 19.34, 0, true ],
-                [ "note", false, "read", 'However the reserved characters', 15.63, 0, true ],
-                [ "normal", false, "replied", 'It is therefore necessary', 24.22, 5.50, true ],
-                [ "important", false, "replied", 'To problems of corruption by', 9.12, -3, true ],
-                [ "note", false, "replied", 'Which would simply be awkward in', 12.15, -4, false ]
+                [ 0, false, "new", 'But are not followed by two hexadecimal', 29.91, 10, false ],
+                [ 1, false, "new", 'Because a % sign always indicates', 9.33, -5, false ],
+                [ 1, false, "read", 'Signs can be selectively', 19.34, 0, true ],
+                [ 2, false, "read", 'However the reserved characters', 15.63, 0, true ],
+                [ 0, false, "replied", 'It is therefore necessary', 24.22, 5.50, true ],
+                [ 1, false, "replied", 'To problems of corruption by', 9.12, -3, true ],
+                [ 2, false, "replied", 'Which would simply be awkward in', 12.15, -4, false ]
         ];
         var rows = 10000;
@@ -103 +103 @@
                 rows: [[
                         { name: 'Id', width: 3, get: function(inRowIndex) { return inRowIndex+1;} },
-                        { name: 'Priority', styles: 'text-align: center;', editor: dojox.grid.editors.Select, options: ["normal", "note", "important"]},
+                        { name: 'Priority', styles: 'text-align: center;', editor: dojox.grid.editors.Select, options: ["normal", "note", "important"], values: [0, 1, 2], formatter: function(inDatum) { return this.options[inDatum]}},
                         { name: 'Mark', width: 3, styles: 'text-align: center;', editor: dojox.grid.editors.Bool },
                         statusCell,

dojox/trunk/grid/_data/editors.js

@@ -187 +187 @@
                 this.needFormatNode(inDatum, inRowIndex);
                 var h = [ '<select class="dojoxGrid-select">' ];
-                for (var i=0, o, v; (o=this.options[i])&&(v=this.values[i]); i++){
-                        h.push("<option", (inDatum==o ? ' selected' : ''), /*' value="' + v + '"',*/ ">", o, "</option>");
+                for (var i=0, o, v; ((o=this.options[i]) !== undefined)&&((v=this.values[i]) !== undefined); i++){
+                        h.push("<option", (inDatum==v ? ' selected' : ''), ' value="' + v + '"', ">", o, "</option>");
                 }
                 h.push('</select>');