You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by bo...@apache.org on 2008/04/02 14:13:55 UTC
svn commit: r643869 - in /myfaces/tobago/branches/tobago-1.0.x: ./
theme/standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago-sheet.js
Author: bommel
Date: Wed Apr 2 05:13:54 2008
New Revision: 643869
URL: http://svn.apache.org/viewvc?rev=643869&view=rev
Log:
Merged revisions 643862 via svnmerge from
https://svn.apache.org/repos/asf/myfaces/tobago/trunk
........
r643862 | lofwyr | 2008-04-02 14:02:34 +0200 (Mi, 02 Apr 2008) | 5 lines
TOBAGO-642: Handling of the "seleced" was fixed:
Javacode on Server uses as format: e. g. ,1,2,3,4,
but the JavascriptCode uses ,1,,2,,3,,4, in that case.
The bug makes it possible that the upper sample will be modified to ,12,,3,,4, which is totally wrong.
So, I've fixed the Javascript-Code with uses now the same format.
........
Modified:
myfaces/tobago/branches/tobago-1.0.x/ (props changed)
myfaces/tobago/branches/tobago-1.0.x/theme/standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago-sheet.js
Propchange: myfaces/tobago/branches/tobago-1.0.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: myfaces/tobago/branches/tobago-1.0.x/theme/standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago-sheet.js
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-1.0.x/theme/standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago-sheet.js?rev=643869&r1=643868&r2=643869&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-1.0.x/theme/standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago-sheet.js (original)
+++ myfaces/tobago/branches/tobago-1.0.x/theme/standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago-sheet.js Wed Apr 2 05:13:54 2008
@@ -493,7 +493,7 @@
if ((!event.ctrlKey && !selector) || this.selectable == "single" ) {
// clearAllSelections();
- Tobago.element(this.selectedId).value = "";
+ Tobago.element(this.selectedId).value = ",";
}
if (event.shiftKey && this.selectable == "multi") {
@@ -614,10 +614,10 @@
var re = new RegExp("," + rowIndex + ",");
var selected = Tobago.element(this.selectedId);
if (selected.value.search(re) != -1) {
- selected.value = selected.value.replace(re, "");
+ selected.value = selected.value.replace(re, ",");
}
else {
- selected.value = selected.value + "," + rowIndex + ",";
+ selected.value = selected.value + rowIndex + ",";
}
}
};
@@ -642,7 +642,7 @@
if (selected.value.search(re) == -1) {
var selector = Tobago.element(this.id + "_data_row_selector_" + i);
if (!selector || !selector.src.match(/Disabled/)) {
- selected.value = selected.value + "," + i + ",";
+ selected.value = selected.value + i + ",";
}
}
}
@@ -832,7 +832,7 @@
if (!image || !image.src.match(/Disabled/)) {
var re = new RegExp("," + i + ",");
if (selected.value.search(re) == -1) {
- selected.value = selected.value + "," + i + ",";
+ selected.value = selected.value + i + ",";
}
}
row = this.getSiblingRow(row, ++i);
@@ -850,12 +850,12 @@
image = this.getSelectionElementForRow(row);
if (!image || !image.src.match(/Disabled/)) {
var re = new RegExp("," + i + ",", 'g');
- selected.value = selected.value.replace(re, "");
+ selected.value = selected.value.replace(re, ",");
}
row = this.getSiblingRow(row, ++i);
}
} else {
- selected.value = "";
+ selected.value = ",";
}
this.updateSelectionView();
};