details: /erp/devel/main/rev/d29934687f5e
changeset: 7811:d29934687f5e
user: David Baz Fayos <david.baz <at> openbravo.com>
date: Fri Jul 02 16:29:37 2010 +0200
summary: Fixed issue 13877: Now there is no IE js error while loading empty
menu
details: /erp/devel/main/rev/66a06de35f5e
changeset: 7812:66a06de35f5e
user: Antonio Moreno <antonio.moreno <at> openbravo.com>
date: Fri Jul 02 16:35:32 2010 +0200
summary: Restored latest dbsourcemanager
details: /erp/devel/main/rev/8a34f5c41154
changeset: 7813:8a34f5c41154
user: RM packaging bot <staff.rm <at> openbravo.com>
date: Sat Jul 03 08:50:33 2010 +0000
summary: CI: promote changesets from pi to main
details: /erp/devel/main/rev/5f410e1491fd
changeset: 7814:5f410e1491fd
user: RM packaging bot <staff.rm <at> openbravo.com>
date: Sat Jul 03 08:50:33 2010 +0000
summary: CI: update AD_MODULE - Core version and label
diffstat:
src-db/database/lib/dbsourcemanager.jar | 0
src-db/database/sourcedata/AD_MODULE.xml | 4 ++--
src/org/openbravo/erpCommon/security/Login_F1.html | 2 +-
src/org/openbravo/erpCommon/utility/VerticalMenu.html | 8 ++++++--
web/js/menuKeyboard.js | 15 +++++++++++++++
web/js/utils.js | 2 +-
6 files changed, 25 insertions(+), 6 deletions(-)
diffs (118 lines):
diff -r 80925690f42b -r 5f410e1491fd src-db/database/lib/dbsourcemanager.jar
Binary file src-db/database/lib/dbsourcemanager.jar has changed
diff -r 80925690f42b -r 5f410e1491fd src-db/database/sourcedata/AD_MODULE.xml
--- a/src-db/database/sourcedata/AD_MODULE.xml Fri Jul 02 17:23:16 2010 +0530
+++ b/src-db/database/sourcedata/AD_MODULE.xml Sat Jul 03 08:50:33 2010 +0000
@@ -6,7 +6,7 @@
<!--0--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
<!--0--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--0--> <NAME><![CDATA[core]]></NAME>
-<!--0--> <VERSION><![CDATA[2.50.17732]]></VERSION>
+<!--0--> <VERSION><![CDATA[2.50.17813]]></VERSION>
<!--0--> <DESCRIPTION><![CDATA[Core module is the base one]]></DESCRIPTION>
<!--0--> <HELP><![CDATA[Core module is the base one, all developments in core
are included as part of the standard Openbravo ERP.]]></HELP>
<!--0--> <URL><![CDATA[www.openbravo.com]]></URL>
@@ -21,7 +21,7 @@
<!--0--> <HASCHARTOFACCOUNTS><![CDATA[N]]></HASCHARTOFACCOUNTS>
<!--0--> <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE>
<!--0--> <HASREFERENCEDATA><![CDATA[Y]]></HASREFERENCEDATA>
-<!--0--> <VERSION_LABEL><![CDATA[dev]]></VERSION_LABEL>
+<!--0--> <VERSION_LABEL><![CDATA[CI]]></VERSION_LABEL>
<!--0--> <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
<!--0--></AD_MODULE>
diff -r 80925690f42b -r 5f410e1491fd
src/org/openbravo/erpCommon/security/Login_F1.html
--- a/src/org/openbravo/erpCommon/security/Login_F1.html Fri Jul 02
17:23:16 2010 +0530
+++ b/src/org/openbravo/erpCommon/security/Login_F1.html Sat Jul 03
08:50:33 2010 +0000
@@ -90,7 +90,7 @@
clearForm();
} catch (e) {}
setWindowElementFocus('firstElement');
- if ((!revisionControl('7734')) || (isOpsInstance() !=
isOpsInstanceCached())) {
+ if ((!revisionControl('7801')) || (isOpsInstance() !=
isOpsInstanceCached())) {
alert(cacheMsg);
}
diff -r 80925690f42b -r 5f410e1491fd
src/org/openbravo/erpCommon/utility/VerticalMenu.html
--- a/src/org/openbravo/erpCommon/utility/VerticalMenu.html Fri Jul 02
17:23:16 2010 +0530
+++ b/src/org/openbravo/erpCommon/utility/VerticalMenu.html Sat Jul 03
08:50:33 2010 +0000
@@ -52,8 +52,12 @@
var h = body[0].clientHeight;
var w = body[0].clientWidth;
var name = window.navigator.appName;
- mnu.style.height = h -(mtop.clientHeight + mtop2.clientHeight +
mbottom.clientHeight) - ((name.indexOf("Microsoft")==-1)?2:0);
- mnu.style.width = w - (mleft.clientWidth + mright.clientWidth) -
((name.indexOf("Microsoft")==-1)?2:0);
+ var mnuWidth = w - (mleft.clientWidth + mright.clientWidth) -
((name.indexOf("Microsoft")==-1)?2:0);
+ var mnuHeight = h -(mtop.clientHeight + mtop2.clientHeight +
mbottom.clientHeight) - ((name.indexOf("Microsoft")==-1)?2:0);
+ if (mnuWidth < 0) { mnuWidth = 0; }
+ if (mnuHeight < 0) { mnuHeight = 0; }
+ mnu.style.width = mnuWidth;
+ mnu.style.height = mnuHeight;
mnu.style.display = "";
}
diff -r 80925690f42b -r 5f410e1491fd web/js/menuKeyboard.js
--- a/web/js/menuKeyboard.js Fri Jul 02 17:23:16 2010 +0530
+++ b/web/js/menuKeyboard.js Sat Jul 03 08:50:33 2010 +0000
@@ -202,6 +202,9 @@
}
}
firstElement = firstElement.firstChild;
+ if (!firstElement) {
+ return null;
+ }
for (;;) {
if (firstElement.nodeType != '1') {
firstElement = firstElement.nextSibling; // TR0
@@ -210,6 +213,9 @@
}
}
firstElement = firstElement.firstChild;
+ if (!firstElement) {
+ return null;
+ }
for (;;) {
if (firstElement.nodeType != '1') {
firstElement = firstElement.nextSibling; // TD
@@ -218,6 +224,9 @@
}
}
firstElement = firstElement.firstChild;
+ if (!firstElement) {
+ return null;
+ }
for (;;) {
if (firstElement.nodeType != '1') {
firstElement = firstElement.nextSibling; // TABLE
@@ -226,6 +235,9 @@
}
}
firstElement = firstElement.firstChild;
+ if (!firstElement) {
+ return null;
+ }
for (;;) {
if (firstElement.nodeType != '1') {
firstElement = firstElement.nextSibling; // TBODY
@@ -234,6 +246,9 @@
}
}
firstElement = firstElement.firstChild;
+ if (!firstElement) {
+ return null;
+ }
for (;;) {
if (firstElement.nodeType != '1') {
firstElement = firstElement.nextSibling; // TR1
diff -r 80925690f42b -r 5f410e1491fd web/js/utils.js
--- a/web/js/utils.js Fri Jul 02 17:23:16 2010 +0530
+++ b/web/js/utils.js Sat Jul 03 08:50:33 2010 +0000
@@ -74,7 +74,7 @@
* Return a number that would be checked at the Login screen to know if the
file is cached with the correct version
*/
function getCurrentRevision() {
- var number = '7734';
+ var number = '7801';
return number;
}
------------------------------------------------------------------------------
This SF.net email is sponsored by Sprint
What will you do first with EVO, the first 4G phone?
Visit sprint.com/first -- http://p.sf.net/sfu/sprint-com-first
_______________________________________________
Openbravo-commits mailing list
Openbravo-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
