details: https://code.openbravo.com/erp/devel/pi/rev/5a46d55cb50b
changeset: 14886:5a46d55cb50b
user: David Baz Fayos <david.baz <at> openbravo.com>
date: Fri Dec 16 22:17:46 2011 +0100
summary: Fixed issue 17622 - Fixed issue 17623: 'Recent items' now can be
opened using [KS]
diffstat:
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/navbar/ob-quick-launch.js
| 56 ++++++---
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-navigation-bar-styles.js
| 3 +-
2 files changed, 38 insertions(+), 21 deletions(-)
diffs (114 lines):
diff -r 06c7f32db85e -r 5a46d55cb50b
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/navbar/ob-quick-launch.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/navbar/ob-quick-launch.js
Fri Dec 16 19:49:01 2011 +0100
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/navbar/ob-quick-launch.js
Fri Dec 16 22:17:46 2011 +0100
@@ -23,12 +23,6 @@
recentObject: null,
prefixLabel: null,
action: function(){
- // getting the last event prevents an error in chrome
- // https://issues.openbravo.com/view.php?id=16847
- var lastEvent = isc.EventHandler.getLastEvent();
- if (!isc.EventHandler.leftButtonDown()) {
- return;
- }
OB.RecentUtilities.addRecent(this.recentPropertyName, this.recentObject);
if (this.recentObject.viewId) {
OB.Layout.ViewManager.openView(this.recentObject.viewId,
this.recentObject);
@@ -88,22 +82,27 @@
index++;
}
}
- if (this.members[0].getMembers()) {
-
this.members[0].destroyAndRemoveMembers(this.members[0].getMembers().duplicate());
- }
+ if (this.members[1].getMembers()) {
+
this.members[1].destroyAndRemoveMembers(this.members[1].getMembers().duplicate());
+ }
- this.members[0].setMembers(newFields);
+ this.members[1].setMembers(newFields);
- this.layout.showMember(this.members[0]);
+ if (this.separatorHeight) {
+ this.members[1].layoutBottomMargin = this.separatorHeight;
+ this.members[1].setLayoutMargin();
+ }
+
+ this.layout.showMember(this.members[1]);
}
- this.members[1].getField('value').setValue(null);
- this.members[1].getField('value').setElementValue('', null);
+ this.members[2].getField('value').setValue(null);
+ this.members[2].getField('value').setElementValue('', null);
},
// handle the case that someone entered a url in the quick launch
doHide: function(){
- if (this.members[1].getField('value').getValue() &&
this.members[1].getField('value').getValue().contains('?')) {
- var params =
OB.Utilities.getUrlParameters(this.members[1].getField('value').getValue());
+ if (this.members[2].getField('value').getValue() &&
this.members[2].getField('value').getValue().contains('?')) {
+ var params =
OB.Utilities.getUrlParameters(this.members[2].getField('value').getValue());
if (params && params.tabId) {
OB.Utilities.openDirectTab(params.tabId, params.recordId,
params.command);
}
@@ -112,7 +111,24 @@
},
initWidget: function(){
- this.members = [isc.VLayout.create({
+ var dummyFirstField = isc.OBFocusButton.create({
+ getFocusTarget: function() {
+ return this.parentElement.members[this.parentElement.members.length-2];
+ }
+ });
+ var dummyLastField = isc.OBFocusButton.create({
+ getFocusTarget: function() {
+ var firstFocusableItem;
+ if (this.parentElement.members[1].members.length > 0) {
+ firstFocusableItem = this.parentElement.members[1].members[0];
+ } else {
+ firstFocusableItem =
this.parentElement.members[this.parentElement.members.length-2];
+ }
+ return firstFocusableItem;
+ }
+ });
+ this.members = [dummyFirstField,
+ isc.VLayout.create({
height: 1, //To allow height grow with its contents
visibility: 'hidden'
}), isc.DynamicForm.create({
@@ -288,14 +304,14 @@
return result;
}
}]
- })];
+ }), dummyLastField];
var ret = this.Super('initWidget', arguments);
// register the field in the registry
- var suggestionField = this.members[1].getField('value');
- OB.TestRegistry.register(this.recentPropertyName + '_RECENTFORM',
this.members[0]);
- OB.TestRegistry.register(this.recentPropertyName + '_FORM',
this.members[1]);
+ var suggestionField = this.members[2].getField('value');
+ OB.TestRegistry.register(this.recentPropertyName + '_RECENTFORM',
this.members[1]);
+ OB.TestRegistry.register(this.recentPropertyName + '_FORM',
this.members[2]);
OB.TestRegistry.register(this.recentPropertyName + '_BUTTON', this);
OB.TestRegistry.register(this.recentPropertyName + '_FIELD',
suggestionField);
diff -r 06c7f32db85e -r 5a46d55cb50b
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-navigation-bar-styles.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-navigation-bar-styles.js
Fri Dec 16 19:49:01 2011 +0100
+++
b/modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-navigation-bar-styles.js
Fri Dec 16 22:17:46 2011 +0100
@@ -60,10 +60,11 @@
// todo: it is nicer to move this to a style but then this issue occurs:
// https://issues.openbravo.com/view.php?id=13786
width: 57,
+ separatorHeight: 10,
layoutProperties: {
width: 250,
- membersMargin: 10
+ membersMargin: 0 // use custom attribute "separatorHeight" instead
},
nodeIcons: {
------------------------------------------------------------------------------
Learn Windows Azure Live! Tuesday, Dec 13, 2011
Microsoft is holding a special Learn Windows Azure training event for
developers. It will provide a great way to learn Windows Azure and what it
provides. You can attend the event by watching it streamed LIVE online.
Learn more at http://p.sf.net/sfu/ms-windowsazure
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
