details: /erp/devel/int/rev/6f298f3e2d89
changeset: 6814:6f298f3e2d89
user: Sivaraman Rajagopal <sivaraman.rajagopal <at> openbravo.com>
date: Mon Mar 29 17:06:33 2010 +0530
summary: Reverted change for the issue #10473 as it breaks build
details: /erp/devel/int/rev/36d350878d3a
changeset: 6815:36d350878d3a
user: David Baz Fayos <david.baz <at> openbravo.com>
date: Mon Mar 29 21:21:54 2010 +0200
summary: Upgrade from Dojo 1.4.2 to Dojo 1.4.3
diffstat:
src-db/database/sourcedata/AD_COLUMN.xml
| 20 +-
src/org/openbravo/erpCommon/security/Login_F1.html
| 2 +-
web/js/dojotoolkit/dijit/Calendar.js
| 2 +-
web/js/dojotoolkit/dijit/_editor/RichText.js
| 2 +-
web/js/dojotoolkit/dijit/_editor/range.js
| 5 +-
web/js/dojotoolkit/dijit/form/ComboBox.js
| 2 +-
web/js/dojotoolkit/dijit/form/TextBox.js
| 11 +-
web/js/dojotoolkit/dijit/form/ValidationTextBox.js
| 13 -
web/js/dojotoolkit/dijit/form/_Spinner.js
| 23 +-
web/js/dojotoolkit/dijit/layout/ScrollingTabController.js
| 4 +-
web/js/dojotoolkit/dijit/themes/dijit.css
| 72 +-
web/js/dojotoolkit/dijit/themes/dijit_rtl.css
| 49 +-
web/js/dojotoolkit/dijit/themes/lucid/Calendar.css
| 256 +-
web/js/dojotoolkit/dijit/themes/lucid/Calendar_rtl.css
| 19 +
web/js/dojotoolkit/dijit/themes/lucid/Dialog.css
| 2 +-
web/js/dojotoolkit/dijit/themes/lucid/ProgressBar.css
| 6 +-
web/js/dojotoolkit/dijit/themes/lucid/TitlePane.css
| 1 -
web/js/dojotoolkit/dijit/themes/lucid/form/Button.css
| 75 +-
web/js/dojotoolkit/dijit/themes/lucid/form/Button_rtl.css
| 13 +-
web/js/dojotoolkit/dijit/themes/lucid/form/Checkbox.css
| 2 +-
web/js/dojotoolkit/dijit/themes/lucid/form/Common.css
| 8 +-
web/js/dojotoolkit/dijit/themes/lucid/form/NumberSpinner.css
| 13 +-
web/js/dojotoolkit/dijit/themes/lucid/form/images/bottom_shadow.png
| 0
web/js/dojotoolkit/dijit/themes/lucid/form/images/bottom_shadow2.png
| 0
web/js/dojotoolkit/dijit/themes/lucid/form/images/button.png
| 0
web/js/dojotoolkit/dijit/themes/lucid/form/images/buttonArrows.png
| 0
web/js/dojotoolkit/dijit/themes/lucid/form/images/button_arrow.png
| 0
web/js/dojotoolkit/dijit/themes/lucid/form/images/button_arrow_hover.png
| 0
web/js/dojotoolkit/dijit/themes/lucid/form/images/button_back_full.png
| 0
web/js/dojotoolkit/dijit/themes/lucid/form/images/button_back_full_arrow.png
| 0
web/js/dojotoolkit/dijit/themes/lucid/form/images/button_bottom_grad.png
| 0
web/js/dojotoolkit/dijit/themes/lucid/form/images/button_bottom_grad_h.png
| 0
web/js/dojotoolkit/dijit/themes/lucid/form/images/button_bottom_grad_s.png
| 0
web/js/dojotoolkit/dijit/themes/lucid/form/images/button_bottom_grad_s_small.png
| 0
web/js/dojotoolkit/dijit/themes/lucid/form/images/button_focus_line.png
| 0
web/js/dojotoolkit/dijit/themes/lucid/form/images/button_grad.png
| 0
web/js/dojotoolkit/dijit/themes/lucid/form/images/button_grad_h.png
| 0
web/js/dojotoolkit/dijit/themes/lucid/form/images/button_grad_h_small.png
| 0
web/js/dojotoolkit/dijit/themes/lucid/form/images/button_grad_s.png
| 0
web/js/dojotoolkit/dijit/themes/lucid/form/images/button_grad_s_small.png
| 0
web/js/dojotoolkit/dijit/themes/lucid/form/images/button_grad_small.png
| 0
web/js/dojotoolkit/dijit/themes/lucid/form/images/calendar_forward_arrow.png
| 0
web/js/dojotoolkit/dijit/themes/lucid/form/images/checkbox_states.png
| 0
web/js/dojotoolkit/dijit/themes/lucid/form/images/drop_top_grad.png
| 0
web/js/dojotoolkit/dijit/themes/lucid/form/images/error_checked.png
| 0
web/js/dojotoolkit/dijit/themes/lucid/form/images/icon_drop_down_h.png
| 0
web/js/dojotoolkit/dijit/themes/lucid/form/images/input_alert.png
| 0
web/js/dojotoolkit/dijit/themes/lucid/form/images/new_back.png
| 0
web/js/dojotoolkit/dijit/themes/lucid/form/images/radio_button_states.png
| 0
web/js/dojotoolkit/dijit/themes/lucid/images/calendarArrows.png
| 0
web/js/dojotoolkit/dijit/themes/lucid/images/calendarArrows8bit.png
| 0
web/js/dojotoolkit/dijit/themes/lucid/images/calendarContainerImages.png
| 0
web/js/dojotoolkit/dijit/themes/lucid/images/calendar_back.gif
| 0
web/js/dojotoolkit/dijit/themes/lucid/images/calendar_back.png
| 0
web/js/dojotoolkit/dijit/themes/lucid/images/progressBarAnim.gif
| 0
web/js/dojotoolkit/dijit/themes/lucid/layout/AccordionContainer.css
| 121 +-
web/js/dojotoolkit/dijit/themes/lucid/layout/BorderContainer.css
| 42 +-
web/js/dojotoolkit/dijit/themes/lucid/layout/TabContainer.css
| 272 +-
web/js/dojotoolkit/dijit/themes/lucid/layout/TabContainer_rtl.css
| 13 +-
web/js/dojotoolkit/dijit/themes/lucid/layout/images/accordion.png
| 0
web/js/dojotoolkit/dijit/themes/lucid/layout/images/accordion_back.png
| 0
web/js/dojotoolkit/dijit/themes/lucid/layout/images/accordion_down.png
| 0
web/js/dojotoolkit/dijit/themes/lucid/layout/images/editor.gif
| 0
web/js/dojotoolkit/dijit/themes/lucid/layout/images/focus.png
| 0
web/js/dojotoolkit/dijit/themes/lucid/layout/images/splitterH.png
| 0
web/js/dojotoolkit/dijit/themes/lucid/layout/images/splitterHorizontalHover.png
| 0
web/js/dojotoolkit/dijit/themes/lucid/layout/images/splitterV.png
| 0
web/js/dojotoolkit/dijit/themes/lucid/layout/images/splitterVerticalHover.png
| 0
web/js/dojotoolkit/dijit/themes/lucid/layout/images/tabBottom.png
| 0
web/js/dojotoolkit/dijit/themes/lucid/layout/images/tabClose.gif
| 0
web/js/dojotoolkit/dijit/themes/lucid/layout/images/tabClose.png
| 0
web/js/dojotoolkit/dijit/themes/lucid/layout/images/tabCloseHover.gif
| 0
web/js/dojotoolkit/dijit/themes/lucid/layout/images/tabCloseHover.png
| 0
web/js/dojotoolkit/dijit/themes/lucid/layout/images/tabLeft.png
| 0
web/js/dojotoolkit/dijit/themes/lucid/layout/images/tabNested.png
| 0
web/js/dojotoolkit/dijit/themes/lucid/layout/images/tabRight.png
| 0
web/js/dojotoolkit/dijit/themes/lucid/layout/images/tabStripMenuButton.png
| 0
web/js/dojotoolkit/dijit/themes/lucid/layout/images/tabStripSlideButtonLeft.png
| 0
web/js/dojotoolkit/dijit/themes/lucid/layout/images/tabStripSlideButtonRight.png
| 0
web/js/dojotoolkit/dijit/themes/lucid/layout/images/tabTop.png
| 0
web/js/dojotoolkit/dijit/themes/lucid/layout/images/tab_back_lucid_left.png
| 0
web/js/dojotoolkit/dijit/themes/lucid/layout/images/tab_back_lucid_right.png
| 0
web/js/dojotoolkit/dijit/themes/lucid/layout/images/tab_bottom.png
| 0
web/js/dojotoolkit/dijit/themes/lucid/layout/images/tab_bottom_back.png
| 0
web/js/dojotoolkit/dijit/themes/lucid/layout/images/tab_bottom_focus.png
| 0
web/js/dojotoolkit/dijit/themes/lucid/layout/images/tab_bottom_top.png
| 0
web/js/dojotoolkit/dijit/themes/lucid/layout/images/tab_close_icon.png
| 0
web/js/dojotoolkit/dijit/themes/lucid/layout/images/tab_close_icon_hover.png
| 0
web/js/dojotoolkit/dijit/themes/lucid/layout/images/tab_close_icon_selected.png
| 0
web/js/dojotoolkit/dijit/themes/lucid/layout/images/tab_container_border.png
| 0
web/js/dojotoolkit/dijit/themes/lucid/layout/images/tab_shadow.png
| 0
web/js/dojotoolkit/dijit/themes/lucid/layout/images/tab_top_back.png
| 0
web/js/dojotoolkit/dijit/themes/lucid/layout/images/tab_top_back_bottom.png
| 0
web/js/dojotoolkit/dijit/themes/lucid/layout/images/tab_top_bottom_grad.png
| 0
web/js/dojotoolkit/dijit/themes/lucid/layout/images/tab_top_bottom_grad_h.png
| 0
web/js/dojotoolkit/dijit/themes/lucid/layout/images/tab_top_bottom_grad_s.png
| 0
web/js/dojotoolkit/dijit/themes/lucid/layout/images/tab_top_grad.png
| 0
web/js/dojotoolkit/dijit/themes/lucid/layout/images/tab_top_grad_focus.png
| 0
web/js/dojotoolkit/dijit/themes/lucid/layout/images/tab_top_grad_h.png
| 0
web/js/dojotoolkit/dijit/themes/lucid/layout/images/tab_top_grad_s.png
| 0
web/js/dojotoolkit/dijit/themes/lucid/layout/images/tab_whitegrad_left.png
| 0
web/js/dojotoolkit/dijit/themes/lucid/lucid.css
| 2 +
web/js/dojotoolkit/dijit/tree/TreeStoreModel.js
| 4 +-
web/js/dojotoolkit/dojo/DeferredList.js
| 135 +-
web/js/dojotoolkit/dojo/_base/Deferred.js
| 529 ++---
web/js/dojotoolkit/dojo/dojo.js
| 2 +-
web/js/dojotoolkit/dojo/dojo.js.uncompressed.js
| 709 +++---
web/js/dojotoolkit/dojo/parser.js
| 146 +-
web/js/dojotoolkit/dojox/atom/io/model.js
| 2 +-
web/js/dojotoolkit/dojox/charting/widget/Legend.js
| 11 +-
web/js/dojotoolkit/dojox/date/islamic/Date.js
| 35 +-
web/js/dojotoolkit/dojox/date/islamic/locale.js
| 8 +-
web/js/dojotoolkit/dojox/drawing/Drawing.js
| 4 +-
web/js/dojotoolkit/dojox/drawing/manager/Anchors.js
| 8 +-
web/js/dojotoolkit/dojox/drawing/manager/Canvas.js
| 8 +-
web/js/dojotoolkit/dojox/drawing/manager/Mouse.js
| 4 +-
web/js/dojotoolkit/dojox/drawing/manager/Stencil.js
| 27 +-
web/js/dojotoolkit/dojox/drawing/manager/keys.js
| 2 +-
web/js/dojotoolkit/dojox/drawing/ui/Button.js
| 14 +-
web/js/dojotoolkit/dojox/drawing/ui/Toolbar.js
| 14 +-
web/js/dojotoolkit/dojox/drawing/ui/Tooltip.js
| 6 +-
web/js/dojotoolkit/dojox/drawing/ui/dom/Pan.js
| 4 +-
web/js/dojotoolkit/dojox/drawing/ui/dom/Toolbar.js
| 8 +-
web/js/dojotoolkit/dojox/form/FileInputAuto.js
| 16 +-
web/js/dojotoolkit/dojox/form/resources/FileInput.css
| 30 +
web/js/dojotoolkit/dojox/html/ext-dojo/style.js
| 4 +-
web/js/dojotoolkit/dojox/html/format.js
| 5 +
web/js/dojotoolkit/dojox/image/Lightbox.js
| 95 +-
web/js/dojotoolkit/dojox/image/resources/Lightbox.css
| 7 +-
web/js/dojotoolkit/dojox/image/resources/Lightbox.html
| 6 +-
web/js/dojotoolkit/dojox/json/query.js
| 14 +-
web/js/dojotoolkit/dojox/mobile.js
| 15 +
web/js/dojotoolkit/dojox/mobile/README
| 55 +
web/js/dojotoolkit/dojox/mobile/_base.js
| 943 ++++++++++
web/js/dojotoolkit/dojox/mobile/compat.js
| 360 +++
web/js/dojotoolkit/dojox/mobile/parser.js
| 68 +
web/js/dojotoolkit/dojox/mobile/themes/android/android-compat.css
| 230 ++
web/js/dojotoolkit/dojox/mobile/themes/android/android.css
| 705 +++++++
web/js/dojotoolkit/dojox/mobile/themes/android/compat/arrow-button-bg.png
| 0
web/js/dojotoolkit/dojox/mobile/themes/android/compat/arrow-button-head.png
| 0
web/js/dojotoolkit/dojox/mobile/themes/android/compat/gray-arrow.png
| 0
web/js/dojotoolkit/dojox/mobile/themes/android/compat/switch-blue-bg.png
| 0
web/js/dojotoolkit/dojox/mobile/themes/android/compat/switch-gray-bg.png
| 0
web/js/dojotoolkit/dojox/mobile/themes/android/compat/switch-knob-bg.png
| 0
web/js/dojotoolkit/dojox/mobile/themes/android/compat/tab-button-bg.png
| 0
web/js/dojotoolkit/dojox/mobile/themes/android/compat/tab-orange-button-bg.png
| 0
web/js/dojotoolkit/dojox/mobile/themes/android/compat/tab-sel-button-bg.png
| 0
web/js/dojotoolkit/dojox/mobile/themes/buttons-compat.css
| 30 +
web/js/dojotoolkit/dojox/mobile/themes/buttons.css
| 191 ++
web/js/dojotoolkit/dojox/mobile/themes/compat/check-off-button.png
| 0
web/js/dojotoolkit/dojox/mobile/themes/compat/check-on-button.png
| 0
web/js/dojotoolkit/dojox/mobile/themes/compat/small-blue-button-bg.png
| 0
web/js/dojotoolkit/dojox/mobile/themes/compat/small-darkblue-button-bg.png
| 0
web/js/dojotoolkit/dojox/mobile/themes/compat/small-red-button-bg.png
| 0
web/js/dojotoolkit/dojox/mobile/themes/iphone/compat/arrow-button-bg.png
| 0
web/js/dojotoolkit/dojox/mobile/themes/iphone/compat/arrow-button-head.png
| 0
web/js/dojotoolkit/dojox/mobile/themes/iphone/compat/blue-button-bg.png
| 0
web/js/dojotoolkit/dojox/mobile/themes/iphone/compat/gray-arrow.png
| 0
web/js/dojotoolkit/dojox/mobile/themes/iphone/compat/heading-bg.png
| 0
web/js/dojotoolkit/dojox/mobile/themes/iphone/compat/icon-content-heading-bg.png
| 0
web/js/dojotoolkit/dojox/mobile/themes/iphone/compat/switch-blue-bg.png
| 0
web/js/dojotoolkit/dojox/mobile/themes/iphone/compat/switch-gray-bg.png
| 0
web/js/dojotoolkit/dojox/mobile/themes/iphone/compat/switch-knob-bg.png
| 0
web/js/dojotoolkit/dojox/mobile/themes/iphone/compat/tab-button-bg.png
| 0
web/js/dojotoolkit/dojox/mobile/themes/iphone/compat/tab-sel-button-bg.png
| 0
web/js/dojotoolkit/dojox/mobile/themes/iphone/compat/white-arrow.png
| 0
web/js/dojotoolkit/dojox/mobile/themes/iphone/iphone-compat.css
| 231 ++
web/js/dojotoolkit/dojox/mobile/themes/iphone/iphone.css
| 695 +++++++
web/js/dojotoolkit/dojox/widget/DataPresentation.js
| 167 +-
web/js/dojotoolkit/version.txt
| 4 +-
web/js/utils.js
| 2 +-
171 files changed, 5073 insertions(+), 1530 deletions(-)
diffs (truncated from 8959 to 300 lines):
diff -r 849d13feadc2 -r 36d350878d3a src-db/database/sourcedata/AD_COLUMN.xml
--- a/src-db/database/sourcedata/AD_COLUMN.xml Mon Mar 29 12:03:20 2010 +0530
+++ b/src-db/database/sourcedata/AD_COLUMN.xml Mon Mar 29 21:21:54 2010 +0200
@@ -98733,11 +98733,11 @@
<!--6513--> <AD_TABLE_ID><![CDATA[473]]></AD_TABLE_ID>
<!--6513--> <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
<!--6513--> <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
-<!--6513--> <ISKEY><![CDATA[N]]></ISKEY>
+<!--6513--> <ISKEY><![CDATA[Y]]></ISKEY>
<!--6513--> <ISPARENT><![CDATA[N]]></ISPARENT>
<!--6513--> <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
<!--6513--> <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
-<!--6513--> <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--6513--> <ISIDENTIFIER><![CDATA[Y]]></ISIDENTIFIER>
<!--6513--> <SEQNO><![CDATA[1]]></SEQNO>
<!--6513--> <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
<!--6513--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
@@ -99050,12 +99050,12 @@
<!--6523--> <AD_REFERENCE_ID><![CDATA[30]]></AD_REFERENCE_ID>
<!--6523--> <AD_REFERENCE_VALUE_ID><![CDATA[800060]]></AD_REFERENCE_VALUE_ID>
<!--6523--> <FIELDLENGTH><![CDATA[60]]></FIELDLENGTH>
-<!--6523--> <ISKEY><![CDATA[Y]]></ISKEY>
+<!--6523--> <ISKEY><![CDATA[N]]></ISKEY>
<!--6523--> <ISPARENT><![CDATA[N]]></ISPARENT>
<!--6523--> <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
<!--6523--> <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
-<!--6523--> <ISIDENTIFIER><![CDATA[Y]]></ISIDENTIFIER>
-<!--6523--> <SEQNO><![CDATA[1]]></SEQNO>
+<!--6523--> <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--6523--> <SEQNO><![CDATA[0]]></SEQNO>
<!--6523--> <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
<!--6523--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
<!--6523--> <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
@@ -99065,7 +99065,7 @@
<!--6523--> <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
<!--6523--> <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
<!--6523--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--6523--> <POSITION><![CDATA[1]]></POSITION>
+<!--6523--> <POSITION><![CDATA[10]]></POSITION>
<!--6523--> <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
<!--6523--></AD_COLUMN>
@@ -99081,12 +99081,12 @@
<!--6524--> <AD_TABLE_ID><![CDATA[473]]></AD_TABLE_ID>
<!--6524--> <AD_REFERENCE_ID><![CDATA[15]]></AD_REFERENCE_ID>
<!--6524--> <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
-<!--6524--> <ISKEY><![CDATA[Y]]></ISKEY>
+<!--6524--> <ISKEY><![CDATA[N]]></ISKEY>
<!--6524--> <ISPARENT><![CDATA[N]]></ISPARENT>
<!--6524--> <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
<!--6524--> <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
-<!--6524--> <ISIDENTIFIER><![CDATA[Y]]></ISIDENTIFIER>
-<!--6524--> <SEQNO><![CDATA[2]]></SEQNO>
+<!--6524--> <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--6524--> <SEQNO><![CDATA[0]]></SEQNO>
<!--6524--> <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
<!--6524--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
<!--6524--> <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
@@ -99096,7 +99096,7 @@
<!--6524--> <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
<!--6524--> <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
<!--6524--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--6524--> <POSITION><![CDATA[1]]></POSITION>
+<!--6524--> <POSITION><![CDATA[13]]></POSITION>
<!--6524--> <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
<!--6524--></AD_COLUMN>
diff -r 849d13feadc2 -r 36d350878d3a
src/org/openbravo/erpCommon/security/Login_F1.html
--- a/src/org/openbravo/erpCommon/security/Login_F1.html Mon Mar 29
12:03:20 2010 +0530
+++ b/src/org/openbravo/erpCommon/security/Login_F1.html Mon Mar 29
21:21:54 2010 +0200
@@ -90,7 +90,7 @@
clearForm();
} catch (e) {}
setWindowElementFocus('firstElement');
- if ((!revisionControl('6810')) || (isOpsInstance() !=
isOpsInstanceCached())) {
+ if ((!revisionControl('6815')) || (isOpsInstance() !=
isOpsInstanceCached())) {
alert(cacheMsg);
}
diff -r 849d13feadc2 -r 36d350878d3a web/js/dojotoolkit/dijit/Calendar.js
--- a/web/js/dojotoolkit/dijit/Calendar.js Mon Mar 29 12:03:20 2010 +0530
+++ b/web/js/dojotoolkit/dijit/Calendar.js Mon Mar 29 21:21:54 2010 +0200
@@ -224,7 +224,7 @@
goToToday: function(){
// summary:
// Sets calendar's value to today's date
- this.attr('value', this.dateClassObj());
+ this.attr('value', new this.dateClassObj());
},
constructor: function(/*Object*/args){
diff -r 849d13feadc2 -r 36d350878d3a
web/js/dojotoolkit/dijit/_editor/RichText.js
--- a/web/js/dojotoolkit/dijit/_editor/RichText.js Mon Mar 29 12:03:20
2010 +0530
+++ b/web/js/dojotoolkit/dijit/_editor/RichText.js Mon Mar 29 21:21:54
2010 +0200
@@ -1305,7 +1305,7 @@
isvalid=true;
var tg = first.tagName ?
first.tagName.toLowerCase() : "";
// Collapse before childless tags.
-
if(/br|input|img|base|meta|area|basefont/.test(tg)){
+
if(/br|input|img|base|meta|area|basefont|hr|link/.test(tg)){
this._sCall("selectElement", [
first ]);
}else{
// Collapse inside tags with
children.
diff -r 849d13feadc2 -r 36d350878d3a web/js/dojotoolkit/dijit/_editor/range.js
--- a/web/js/dojotoolkit/dijit/_editor/range.js Mon Mar 29 12:03:20 2010 +0530
+++ b/web/js/dojotoolkit/dijit/_editor/range.js Mon Mar 29 21:21:54 2010 +0200
@@ -74,12 +74,13 @@
return node;
}
-dijit.range.getCommonAncestor = function(n1,n2){
+dijit.range.getCommonAncestor = function(n1,n2,root){
+ root = root||n1.ownerDocument.body;
var getAncestors = function(n){
var as=[];
while(n){
as.unshift(n);
- if(n.nodeName!='BODY'){
+ if(n !== root){
n = n.parentNode;
}else{
break;
diff -r 849d13feadc2 -r 36d350878d3a web/js/dojotoolkit/dijit/form/ComboBox.js
--- a/web/js/dojotoolkit/dijit/form/ComboBox.js Mon Mar 29 12:03:20 2010 +0530
+++ b/web/js/dojotoolkit/dijit/form/ComboBox.js Mon Mar 29 21:21:54 2010 +0200
@@ -116,7 +116,7 @@
// Defaults to true.
hasDownArrow: true,
- templateString: dojo.cache("dijit.form",
"templates/ComboBox.html", "<div class=\"dijit dijitReset dijitInlineTable
dijitLeft\"\n\tid=\"widget_${id}\"\n\tdojoAttachPoint=\"comboNode\"
waiRole=\"combobox\" tabIndex=\"-1\"\n\t><div
style=\"overflow:hidden;\"\n\t\t><div class='dijitReset dijitRight
dijitButtonNode dijitArrowButton
dijitDownArrowButton'\n\t\t\tdojoAttachPoint=\"downArrowNode\"
waiRole=\"presentation\"\n\t\t\tdojoAttachEvent=\"onmousedown:_onArrowMouseDown\"\n\t\t\t><div
class=\"dijitArrowButtonInner\"> </div\n\t\t\t><div
class=\"dijitArrowButtonChar\">▼</div\n\t\t></div\n\t\t><div
class=\"dijitReset dijitValidationIcon\"><br></div\n\t\t><div
class=\"dijitReset dijitValidationIconText\">Χ</div\n\t\t><div
class=\"dijitReset dijitInputField\"\n\t\t\t><input ${nameAttrSetting}
type=\"text\" autocomplete=\"off\"
class='dijitReset'\n\t\t\tdojoAttachEvent=\"onkeypress:_onKeyPress,compositionend\"\n\t\t\tdojoAttachPoint=\"textbox,focusNode\"
waiRole=\"textbox\"
waiState=\"haspopup-true,autocomplete-list\"\n\t\t/></div\n\t></div\n></div>\n"),
+ templateString: dojo.cache("dijit.form",
"templates/ComboBox.html", "<div class=\"dijit dijitReset dijitInlineTable
dijitLeft\"\n\tid=\"widget_${id}\"\n\tdojoAttachPoint=\"comboNode\"
waiRole=\"combobox\" tabIndex=\"-1\"\n\t><div
style=\"overflow:hidden;\"\n\t\t><div class='dijitReset dijitRight
dijitButtonNode dijitArrowButton
dijitDownArrowButton'\n\t\t\tdojoAttachPoint=\"downArrowNode\"
waiRole=\"presentation\"\n\t\t\tdojoAttachEvent=\"onmousedown:_onArrowMouseDown\"\n\t\t\t><div
class=\"dijitArrowButtonInner\"> </div\n\t\t\t><div
class=\"dijitArrowButtonChar\">▼</div\n\t\t></div\n\t\t><div
class=\"dijitReset dijitValidationIcon\"><br></div\n\t\t><div
class=\"dijitReset dijitValidationIconText\">Χ</div\n\t\t><div
class=\"dijitReset dijitInputField\"\n\t\t\t><input ${nameAttrSetting}
type=\"text\" autocomplete=\"off\"
class='dijitReset'\n\t\t\tdojoAttachEvent=\"onkeypress:_onKeyPress,compositionend\"\n\t\t\tdojoAttachPoint=\"textbox,focusNode\"
waiRole=\"textbox\"
waiState=\"haspopup-true,autocomplete-list\"\n\t\t/></div\n\t></div\n></div>\n"),
baseClass:"dijitTextBox dijitComboBox",
diff -r 849d13feadc2 -r 36d350878d3a web/js/dojotoolkit/dijit/form/TextBox.js
--- a/web/js/dojotoolkit/dijit/form/TextBox.js Mon Mar 29 12:03:20 2010 +0530
+++ b/web/js/dojotoolkit/dijit/form/TextBox.js Mon Mar 29 21:21:54 2010 +0200
@@ -42,7 +42,7 @@
// If true, all text will be selected when focused
with mouse
selectOnClick: false,
- templateString: dojo.cache("dijit.form",
"templates/TextBox.html", "<input class=\"dijit dijitReset dijitLeft\"
dojoAttachPoint='textbox,focusNode'\n\tautocomplete=\"off\" type=\"${type}\"
${nameAttrSetting}\n\t/>\n"),
+ templateString: dojo.cache("dijit.form",
"templates/TextBox.html", "<div class=\"dijit dijitReset dijitInline
dijitLeft\" id=\"widget_${id}\" waiRole=\"presentation\"\n\t><div
class=\"dijitReset dijitInputField\"\n\t\t><input class=\"dijitReset\"
dojoAttachPoint='textbox,focusNode'
autocomplete=\"off\"\n\t\t${nameAttrSetting}
type='${type}'\n\t/></div\n></div>\n"),
baseClass: "dijitTextBox",
attributeMap:
dojo.delegate(dijit.form._FormValueWidget.prototype.attributeMap, {
@@ -206,6 +206,15 @@
postCreate: function(){
// setting the value here is needed since value="" in
the template causes "undefined"
// and setting in the DOM (instead of the JS object)
helps with form reset actions
+ if(dojo.isIE){ // IE INPUT tag fontFamily has to be set
directly using STYLE
+ var s = dojo.getComputedStyle(this.focusNode);
+ if(s){
+ var ff = s.fontFamily;
+ if(ff){
+ this.focusNode.style.fontFamily
= ff;
+ }
+ }
+ }
this.textbox.setAttribute("value", this.textbox.value);
// DOM and JS values shuld be the same
this.inherited(arguments);
if(dojo.isMoz || dojo.isOpera){
diff -r 849d13feadc2 -r 36d350878d3a
web/js/dojotoolkit/dijit/form/ValidationTextBox.js
--- a/web/js/dojotoolkit/dijit/form/ValidationTextBox.js Mon Mar 29
12:03:20 2010 +0530
+++ b/web/js/dojotoolkit/dijit/form/ValidationTextBox.js Mon Mar 29
21:21:54 2010 +0200
@@ -259,19 +259,6 @@
this._refreshState();
},
- postCreate: function(){
- if(dojo.isIE){ // IE INPUT tag fontFamily has to be set
directly using STYLE
- var s = dojo.getComputedStyle(this.focusNode);
- if(s){
- var ff = s.fontFamily;
- if(ff){
- this.focusNode.style.fontFamily
= ff;
- }
- }
- }
- this.inherited(arguments);
- },
-
reset:function(){
// Overrides dijit.form.TextBox.reset() by also
// hiding errors about partial matches
diff -r 849d13feadc2 -r 36d350878d3a web/js/dojotoolkit/dijit/form/_Spinner.js
--- a/web/js/dojotoolkit/dijit/form/_Spinner.js Mon Mar 29 12:03:20 2010 +0530
+++ b/web/js/dojotoolkit/dijit/form/_Spinner.js Mon Mar 29 21:21:54 2010 +0200
@@ -39,7 +39,7 @@
// Adjust the value by this much when spinning using the
PgUp/Dn keys
largeDelta: 10,
- templateString: dojo.cache("dijit.form",
"templates/Spinner.html", "<div class=\"dijit dijitReset dijitInlineTable
dijitLeft\"\n\tid=\"widget_${id}\" waiRole=\"presentation\"\n\t><div
class=\"dijitInputLayoutContainer\"\n\t\t><div class=\"dijitReset
dijitSpinnerButtonContainer\"\n\t\t\t> <div class=\"dijitReset dijitLeft
dijitButtonNode dijitArrowButton
dijitUpArrowButton\"\n\t\t\t\tdojoAttachPoint=\"upArrowNode\"\n\t\t\t\t><div
class=\"dijitArrowButtonInner\"> </div\n\t\t\t\t><div
class=\"dijitArrowButtonChar\">▲</div\n\t\t\t></div\n\t\t\t><div
class=\"dijitReset dijitLeft dijitButtonNode dijitArrowButton
dijitDownArrowButton\"\n\t\t\t\tdojoAttachPoint=\"downArrowNode\"\n\t\t\t\t><div
class=\"dijitArrowButtonInner\"> </div\n\t\t\t\t><div
class=\"dijitArrowButtonChar\">▼</div\n\t\t\t></div\n\t\t></div\n\t\t><div
class=\"dijitReset dijitValidationIcon\"><br></div\n\t\t><div
class=\"dijitReset dijitValidationIconText\">Χ</div\n\t\t><div
class=\"dijitReset dijitInputField\"\n\t\t\t><input class='dijitReset'
dojoAttachPoint=\"textbox,focusNode\" type=\"${type}\"
dojoAttachEvent=\"onkeypress:_onKeyPress\"\n\t\t\t\twaiRole=\"spinbutton\"
autocomplete=\"off\" ${nameAttrSetting}\n\t\t/></div\n\t></div\n></div>\n"),
+ templateString: dojo.cache("dijit.form",
"templates/Spinner.html", "<div class=\"dijit dijitReset dijitInlineTable
dijitLeft\"\n\tid=\"widget_${id}\" waiRole=\"presentation\"\n\t><div
class=\"dijitInputLayoutContainer\"\n\t\t><div class=\"dijitReset
dijitSpinnerButtonContainer\"\n\t\t\t><div class=\"dijitReset dijitLeft
dijitButtonNode dijitArrowButton
dijitUpArrowButton\"\n\t\t\t\tdojoAttachPoint=\"upArrowNode\"\n\t\t\t\t><div
class=\"dijitArrowButtonInner\"\n\t\t\t\t\t><div
class=\"dijitArrowButtonInnerHalfHeight\"></div\n\t\t\t\t></div\n\t\t\t\t><div
class=\"dijitArrowButtonChar\">▲</div\n\t\t\t></div\n\t\t\t><div
class=\"dijitReset dijitLeft dijitButtonNode dijitArrowButton
dijitDownArrowButton\"\n\t\t\t\tdojoAttachPoint=\"downArrowNode\"\n\t\t\t\t><div
class=\"dijitArrowButtonInner\"\n\t\t\t\t\t><div
class=\"dijitArrowButtonInnerHalfHeight\"></div\n\t\t\t\t></div\n\t\t\t\t><div
class=\"dijitArrowButtonChar\">▼</div\n\t\t\t></div\n\t\t> </div\n\t\t><div
class=\"dijitReset dijitValidationIcon\"><BR></div\n\t\t><div
class=\"dijitReset dijitValidationIconText\">Χ</div\n\t\t><div
class=\"dijitReset dijitInputField\"\n\t\t\t><input class='dijitReset'
dojoAttachPoint=\"textbox,focusNode\" type=\"${type}\"
dojoAttachEvent=\"onkeypress:_onKeyPress\"\n\t\t\t\twaiRole=\"spinbutton\"
autocomplete=\"off\" ${nameAttrSetting}\n\t\t/></div\n\t></div\n></div>\n"),
baseClass: "dijitTextBox dijitSpinner",
@@ -118,27 +118,6 @@
this._connects.push(dijit.typematic.addListener(this.downArrowNode,
this.textbox,
{charOrCode:dojo.keys.DOWN_ARROW,ctrlKey:false,altKey:false,shiftKey:false,metaKey:false},
this, "_typematicCallback", this.timeoutChangeRate, this.defaultTimeout));
this._connects.push(dijit.typematic.addListener(this.upArrowNode, this.textbox,
{charOrCode:dojo.keys.PAGE_UP,ctrlKey:false,altKey:false,shiftKey:false,metaKey:false},
this, "_typematicCallback", this.timeoutChangeRate, this.defaultTimeout));
this._connects.push(dijit.typematic.addListener(this.downArrowNode,
this.textbox,
{charOrCode:dojo.keys.PAGE_DOWN,ctrlKey:false,altKey:false,shiftKey:false,metaKey:false},
this, "_typematicCallback", this.timeoutChangeRate, this.defaultTimeout));
- if(dojo.isIE){
- var _this = this;
- (function resize(){
- var sz =
_this.upArrowNode.parentNode.offsetHeight;
- if(sz){
- _this.upArrowNode.style.height
= sz >> 1;
-
_this.downArrowNode.style.height = sz - (sz >> 1);
-
_this.focusNode.parentNode.style.height = sz;
- }
- })();
- this.connect(this.domNode, "onresize",
- function(){ setTimeout(
- function(){
- resize();
- // cause IE to rerender
when spinner is moved from hidden to visible
- _this._setStateClass();
- }, 0);
- }
- );
- this._layoutHackIE7();
- }
}
});
diff -r 849d13feadc2 -r 36d350878d3a
web/js/dojotoolkit/dijit/layout/ScrollingTabController.js
--- a/web/js/dojotoolkit/dijit/layout/ScrollingTabController.js Mon Mar 29
12:03:20 2010 +0530
+++ b/web/js/dojotoolkit/dijit/layout/ScrollingTabController.js Mon Mar 29
21:21:54 2010 +0200
@@ -83,10 +83,12 @@
this.inherited(arguments);
var menuItem;
if(this.useMenu){
+ var containerId = this.containerId;
menuItem = new dijit.MenuItem({
label: page.title,
onClick: dojo.hitch(this, function(){
- this.onSelectChild(page);
+ var container = dijit.byId(containerId);
+ container.selectChild(page);
})
});
this._menuChildren[page.id] = menuItem;
diff -r 849d13feadc2 -r 36d350878d3a web/js/dojotoolkit/dijit/themes/dijit.css
--- a/web/js/dojotoolkit/dijit/themes/dijit.css Mon Mar 29 12:03:20 2010 +0530
+++ b/web/js/dojotoolkit/dijit/themes/dijit.css Mon Mar 29 21:21:54 2010 +0200
@@ -47,14 +47,9 @@
position: relative; /* to support setting
width/height, see #2033 */
}
-
-.dj_ie INPUT.dijitTextBox,
.dj_ie .dijitInputField INPUT {
font-size: 100%;
-}
-
-.dj_ie .dijitInputField INPUT { /* try to get rid of IE implicit margin around
INPUT */
- margin: -1px 0 !important;
+ float: left; /* removes hidden top/bottom margin */
}
.dijitInlineTable {
@@ -196,11 +191,15 @@
display: none !important;
}
.dijitButtonNode .dijitArrowButtonInner {
- background:no-repeat center;
+ background: no-repeat center;
width: 16px;
+ margin: 0px;
+ height: 100%;
+ direction: ltr; /* needed by IE/RTL */
}
.dijitComboBox .dijitArrowButtonInner {
display: block;
+ overflow: hidden;
}
/* In high contrast mode, display the check symbol */
@@ -323,19 +322,21 @@
position: absolute;
right: 0;
float: none;
-}
-.dijitSpinner .dijitInputLayoutContainer .dijitArrowButton {
- position: absolute;
height: 50%;
+ width: 100%;
+ bottom: auto;
+ left: 0;
+ right: auto;
}
.dijitSpinner .dijitInputLayoutContainer .dijitDownArrowButton {
- top: auto;
- bottom: 0;
+ top: 50%;
border-top-width: 1px !important;
}
.dijitSpinner .dijitInputLayoutContainer .dijitUpArrowButton {
top: 0;
- bottom: auto;
------------------------------------------------------------------------------
Download Intel® Parallel Studio Eval
Try the new software tools for yourself. Speed compiling, find bugs
proactively, and fine-tune applications for parallel performance.
See why Intel Parallel Studio got high marks during beta.
http://p.sf.net/sfu/intel-sw-dev
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
