OSDN -- Develop and Download Open Source Software
  • R/O
  • SSH
  • HTTPS

globalbase: Commit


Commit MetaInfo

Revision4834 (tree)
Time2011-03-25 20:02:00
Authornakajima_zeta

Log Message

gvSet PREFERENCES.USER.HOME.URL test code

Change Summary

Incremental Difference

--- gbs/branches/bra-xul-js/zeta/nakajima/trunk/env/src/scripts/gt/std/GtIOPane.js (revision 4833)
+++ gbs/branches/bra-xul-js/zeta/nakajima/trunk/env/src/scripts/gt/std/GtIOPane.js (revision 4834)
@@ -209,6 +209,13 @@
209209 var itemContents = null;
210210 if(ft!=null){
211211 itemContents = this.i_attachDestPane.getItemContents(ft, this);
212+
213+ d_p("i_setupItemContentsFromAttachDest ft=" + ft +
214+ " itemContents=" + itemContents +
215+ " itemContents[0]=" + itemContents[0] +
216+ " itemContents[0][0]=" + itemContents[0][0] +
217+ " itemContents[0][0].description=" + itemContents[0][0].description
218+ );
212219 }
213220
214221 if(itemContents==null){
@@ -726,6 +733,7 @@
726733 index2 = 0;
727734 }
728735
736+ d_p("GtIOPane setData(selected) called index1="+index1 + " index2="+index2);
729737 var item = this.i_mappedItemContents[index1][index2];
730738 if(item.selected != dataValue){
731739 item.selected = dataValue;
@@ -845,7 +853,7 @@
845853 }
846854
847855 var itemsLen = this.i_mappedItemContents.length;
848- for(i=0; i<itemsLen; ++i){
856+ for(var i=0; i<itemsLen; ++i){
849857 var oldSelected = this.i_mappedItemContents[i][0].selected;
850858 var found = gtutils.arrayIndexOf(indexArray, i) != -1;
851859 if(found){
--- gbs/branches/bra-xul-js/zeta/nakajima/trunk/env/src/scripts/gt/std/co_GtGVItemContentsExchanger.js (revision 4833)
+++ gbs/branches/bra-xul-js/zeta/nakajima/trunk/env/src/scripts/gt/std/co_GtGVItemContentsExchanger.js (revision 4834)
@@ -141,12 +141,15 @@
141141 p.data = event.param.ret;
142142 p.status = "COMPLETE";
143143
144- if(!p.data[0][0]){
145- d_p("p.property = "+p.property);
146- d_p("p.data[0][0]="+p.data[0][0]);
147- }
148-
149- // d_p("ZZZZZ COMPLETE p.data[0][0].description=" + p.data[0][0].description + "\n p.data[0][0].value=" + p.data[0][0].value);
144+ /*
145+ // dump loaded data.
146+ d_p("############ LOADING COMPLETE p.data.length="+p.data.length);
147+ d_p("p.property = "+p.property);
148+ d_p(p.data, "p.data", true);
149+ d_p(p.data[0], "p.data[0]", true);
150+ d_p(p.data[0][0], "p.data[0][0]", true);
151+ */
152+
150153 var changeItemContentsInfo = new GtChangeItemContents();
151154 changeItemContentsInfo.subtype = "UPDATE";
152155 changeItemContentsInfo.target = p.data;
@@ -165,9 +168,10 @@
165168
166169 ACT_START_DC : function(event) {
167170 var p = this.propCacheEntry;
168- d_p("write " + p.property + "[0][0] GtItem write test code.");
169171 // p.gvthis.gvSet(p.property+"[0][0]", p.data[0][0], this);
170- p.gvthis.gvSet(p.property, p.data, this);
172+ var gvSetRet = p.gvthis.gvSet(p.property, p.data, this);
173+ d_p("gvSetRet = " + gvSetRet);
174+
171175 return "ACT_WAIT_GVSET_COMPLETE";
172176 },
173177
@@ -176,6 +180,7 @@
176180 d_assert(event.type);
177181 return null;
178182 }
183+ d_p("ACT_WAIT_GVSET_COMPLETE called.");
179184 return "doACT_START";
180185 },
181186
--- gbs/branches/bra-xul-js/zeta/nakajima/trunk/env/src/scripts/gt/std/GtItem.js (revision 4833)
+++ gbs/branches/bra-xul-js/zeta/nakajima/trunk/env/src/scripts/gt/std/GtItem.js (revision 4834)
@@ -72,9 +72,13 @@
7272 (lhs.selected == rhs.selected) &&
7373 (lhs.description == rhs.description) &&
7474 (lhs.alt == rhs.alt) &&
75- (lhs.value == rhs.value) &&
75+ (lhs.value == rhs.value);
76+ /*&&
7677 (lhs.create == rhs.create) &&
7778 (lhs.target == rhs.target);
79+ ignore which is not data
80+ */
81+
7882 }
7983
8084 GtItem.equalsArray = function(lhs, rhs){
@@ -244,4 +248,11 @@
244248
245249 return destItems;
246250
247-}
\ No newline at end of file
251+}
252+
253+GtItem.isBeforeLoadGtItemArray = function(gtItemArray){
254+ if(gtItemArray.length == 1){
255+ return (gtItemArray[0].value === GtItem.prototype.value) && (gtItemArray[0].description === GtItem.prototype.description);
256+ }
257+ return false;
258+}
--- gbs/branches/bra-xul-js/zeta/nakajima/trunk/env/src/scripts/gt/std/GtGVItemContentsExchanger.js (revision 4833)
+++ gbs/branches/bra-xul-js/zeta/nakajima/trunk/env/src/scripts/gt/std/GtGVItemContentsExchanger.js (revision 4834)
@@ -417,6 +417,8 @@
417417 }
418418
419419 var isStartNewTransaction = false;
420+
421+
420422 if (cacheEntry.status == "LOADING") {
421423 if( (tblIndex===0||tblIndex) && (fieldIndex===0||fieldIndex) ){
422424 cacheEntry.data[tblIndex][fieldIndex] = changedData;
@@ -432,6 +434,7 @@
432434 else if(cacheEntry.status == "COMPLETE"){
433435 if( (tblIndex===0||tblIndex) && (fieldIndex===0||fieldIndex) ){
434436 if(!GtItem.equals(cacheEntry.data[tblIndex][fieldIndex], changedData)){
437+ d_p("set isStartNewTransaction to true ");
435438 cacheEntry.data[tblIndex][fieldIndex] = changedData;
436439 isStartNewTransaction = true;
437440 }
@@ -461,6 +464,7 @@
461464 cacheEntry.i_coObject = new co_GtGVItemContentsExchanger(this, "dataChange", absoluteProperty);
462465 }
463466 }
467+
464468 return "ACT_START";
465469 }
466470 }
--- gbs/branches/bra-xul-js/zeta/nakajima/trunk/env/src/scripts/gt/itp/xulrunner/std/GtBasicIOPanes.js (revision 4833)
+++ gbs/branches/bra-xul-js/zeta/nakajima/trunk/env/src/scripts/gt/itp/xulrunner/std/GtBasicIOPanes.js (revision 4834)
@@ -213,6 +213,8 @@
213213
214214
215215
216+// according to data from gv, each radiobutton has a array of GtItem...
217+/*
216218 GtIOPane.definePane({
217219 className : "i_GtIORadioPane",
218220 nodeName : "radio",
@@ -227,6 +229,7 @@
227229 return;
228230 }
229231 if(newSelected){
232+ d_p("GtIORadioPane newSelected="+newSelected+" thisValue="+thisValue);
230233 this.setData("value", thisValue);
231234 }
232235 // this.setData("selected", this.uiObject.selected);
@@ -235,8 +238,54 @@
235238 command : null
236239 }
237240 });
241+*/
238242
243+GtIOPane.definePane({
244+ className : "i_GtIORadioPane",
245+ nodeName : "radio",
246+ itemContentsType : "array",
247+ updateUiByData : function(gtItemArray){
248+ if(GtItem.isBeforeLoadGtItemArray(gtItemArray)){
249+ return;
250+ }
239251
252+ var gtItem = this.i_getMyItemFromGtItemArray(gtItemArray);
253+ d_assert(gtItem || ("invalid gtItem for radio. gtValue= "+this.getAttribute("gtValue")+" "+this+" gtItemArray="+gtItemArray) );
254+ if(gtItem.selected)
255+ this.uiObject.radioGroup.selectedItem = this.uiObject;
256+ },
257+
258+ updateDataByUi : function(gtItemArray){
259+ var selectedValue = this.uiObject.radioGroup.selectedItem.getAttribute("gtValue");
260+ for(var i=0; i<gtItemArray.length; ++i){
261+ if(selectedValue == gtItemArray[i].value){
262+ this.setSelectedIndex(i);
263+ break;
264+ }
265+ }
266+ },
267+ dataChangeUiEvents : {
268+ command : function(uiEvent, gtEventParam){
269+ gtEventParam.target = this.getData("items");
270+ gtEventParam.tblIndex = null;
271+ gtEventParam.fieldIndex = null;
272+ }
273+ },
274+ members : {
275+ i_getMyItemFromGtItemArray : function(gtItemArray){
276+ var thisValue = this.uiObject.getAttribute("gtValue");
277+ for(var i=0; i<gtItemArray.length; ++i){
278+ var gtItem = gtItemArray[i];
279+ if(gtItem.value === thisValue){
280+ return gtItem;
281+ }
282+ }
283+ return null;
284+ }
285+ }
286+
287+});
288+
240289 GtIOPane.definePane({
241290 className : "i_GtIORadioGroup",
242291 nodeName : "radiogroup",
Show on old repository browser