Menu
▾
▴
[Jaffa-svn] SF.net SVN: jaffa:[6207] branches/JAFFA_5_12_RELEASE
|
From: <er...@us...> - 2012-05-23 22:05:34
|
Revision: 6207
http://jaffa.svn.sourceforge.net/jaffa/?rev=6207&view=rev
Author: erikb78
Date: 2012-05-23 22:05:27 +0000 (Wed, 23 May 2012)
Log Message:
-----------
Reverted merge
Modified Paths:
--------------
branches/JAFFA_5_12_RELEASE/JaffaRIA/source/html/js/extjs/ext-overrides.js
branches/JAFFA_5_12_RELEASE/JaffaRIA/source/html/js/extjs/jaffa/component/PanelController.js
branches/JAFFA_5_12_RELEASE/JaffaRIA/source/html/js/extjs/jaffa/finder/FinderComboGrid.js
branches/JAFFA_5_12_RELEASE/JaffaRIA/source/html/js/extjs/jaffa/maintenance/plugins/Panel.js
branches/JAFFA_5_12_RELEASE/JaffaRIA/source/html/js/extjs/jaffa/metadata/rules.jsp
branches/JAFFA_5_12_RELEASE/JaffaRIA/source/html/js/extjs/ux/form/HtmlEditorWithView.js
Property Changed:
----------------
branches/JAFFA_5_12_RELEASE/
branches/JAFFA_5_12_RELEASE/JaffaRIA/source/html/js/extjs/ext-overrides.js
branches/JAFFA_5_12_RELEASE/JaffaRIA/source/html/js/extjs/jaffa/component/PanelController.js
branches/JAFFA_5_12_RELEASE/JaffaRIA/source/html/js/extjs/jaffa/finder/FinderComboBox.js
branches/JAFFA_5_12_RELEASE/JaffaRIA/source/html/js/extjs/jaffa/maintenance/plugins/Panel.js
branches/JAFFA_5_12_RELEASE/JaffaRIA/source/html/js/extjs/jaffa/metadata/rules.jsp
Property changes on: branches/JAFFA_5_12_RELEASE
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/JAFFA_2_1_0_RELEASE:3009-3735
/branches/JAFFA_4_1_0_RELEASE:3009-3734
/branches/JAFFA_5_0_0_RELEASE:3427-3733
/branches/JAFFA_5_10_RELEASE:5429-6201
/branches/JAFFA_5_11_RELEASE:5507-6112
/branches/JAFFA_5_1_0_RELEASE:3704-3732
/branches/JAFFA_5_7_RELEASE:4878-6102
/branches/JAFFA_5_8_RELEASE:5013-6200
/branches/JAFFA_5_9_RELEASE:5138-6104
/trunk/JaffaBuild/build/shared.ant.properties:1685-4877
+ /branches/JAFFA_2_1_0_RELEASE:3009-3735
/branches/JAFFA_4_1_0_RELEASE:3009-3734
/branches/JAFFA_5_0_0_RELEASE:3427-3733
/branches/JAFFA_5_10_RELEASE:5429-6105
/branches/JAFFA_5_11_RELEASE:5507-6112
/branches/JAFFA_5_1_0_RELEASE:3704-3732
/branches/JAFFA_5_7_RELEASE:4878-6102
/branches/JAFFA_5_8_RELEASE:5013-6200
/branches/JAFFA_5_9_RELEASE:5138-6104
/trunk/JaffaBuild/build/shared.ant.properties:1685-4877
Modified: branches/JAFFA_5_12_RELEASE/JaffaRIA/source/html/js/extjs/ext-overrides.js
===================================================================
--- branches/JAFFA_5_12_RELEASE/JaffaRIA/source/html/js/extjs/ext-overrides.js 2012-05-23 21:49:33 UTC (rev 6206)
+++ branches/JAFFA_5_12_RELEASE/JaffaRIA/source/html/js/extjs/ext-overrides.js 2012-05-23 22:05:27 UTC (rev 6207)
@@ -358,7 +358,6 @@
// Bug from forum fixed... http://www.sencha.com/forum/showthread.php?75751-OPEN-42-ComboBox-s-setValue-call-with-a-remotely-loaded-Store&p=385027&viewfull=1#post385027
-<<<<<<< .working
setValue : function(v){
var text = v;
if(this.valueField){
@@ -406,52 +405,6 @@
}
}
},
-=======
- setValue : function(v){
- var text = v;
- if(this.valueField){
- if(this.mode == 'remote' && !Ext.isDefined(this.store.totalLength)){
- this.store.on('load', this.setValue.createDelegate(this, arguments), null, {single: true});
- if(this.store.lastOptions === null){
- var params = {};
- var primarySearchField = this.primarySearchField || (this.meta&&this.meta.finder&&this.meta.finder.primarySearchField)?this.meta.finder.primarySearchField:false || this.valueField;
- if(primarySearchField && v){
- params[primarySearchField] = {operator:'Equals',values:[v]};
- }else{
- params[this.queryParam] = this.allQuery;
- }
- this.store.load({params: params});
- }
- return;
- }
- var r = this.findRecord(this.valueField, v);
- if(r){
- text = r.data[this.displayField];
- }else if(this.valueNotFoundText !== undefined){
- text = this.valueNotFoundText;
- }
- }
- this.lastSelectionText = text;
- if(this.hiddenField){
- this.hiddenField.value = v;
- }
- if (this.textOnly) {
- Ext.form.ComboBox.superclass.setValue.call(this, text);
- this.value = v;
- } else {
- this.value = v;
- if (this.rendered) {
- Ext.form.ComboBox.superclass.setRawValue.call(this, text);
- // validate() called in superclass.setValue() validates on the display value
- // this validate() is to validate on the inherent value
- this.validate();
- if(Ext.isFunction(this.completeEditing)){
- this.completeEditing();
- }
- }
- }
- },
->>>>>>> .merge-right.r6201
// End of ExtJS Bug ... http://www.sencha.com/forum/showthread.php?75751-OPEN-42-ComboBox-s-setValue-call-with-a-remotely-loaded-Store&p=385027&viewfull=1#post385027
//Override to use '==='. This allows the use of true and false values in the store.
Property changes on: branches/JAFFA_5_12_RELEASE/JaffaRIA/source/html/js/extjs/ext-overrides.js
___________________________________________________________________
Added: svn:mergeinfo
+ /branches/JAFFA_2_1_0_RELEASE/JaffaRIA/source/html/js/extjs/ext-overrides.js:3009-3735
/branches/JAFFA_4_1_0_RELEASE/JaffaRIA/source/html/js/extjs/ext-overrides.js:3009-3734
/branches/JAFFA_5_0_0_RELEASE/JaffaRIA/source/html/js/extjs/ext-overrides.js:3427-3733
/branches/JAFFA_5_10_RELEASE/JaffaRIA/source/html/js/extjs/ext-overrides.js:5429-6204
/branches/JAFFA_5_11_RELEASE/JaffaRIA/source/html/js/extjs/ext-overrides.js:5507-6112
/branches/JAFFA_5_1_0_RELEASE/JaffaRIA/source/html/js/extjs/ext-overrides.js:3704-3732
/branches/JAFFA_5_7_RELEASE/JaffaRIA/source/html/js/extjs/ext-overrides.js:4878-6102
/branches/JAFFA_5_8_RELEASE/JaffaRIA/source/html/js/extjs/ext-overrides.js:5013-6200
/branches/JAFFA_5_9_RELEASE/JaffaRIA/source/html/js/extjs/ext-overrides.js:5138-6104
/trunk/JaffaBuild/build/shared.ant.properties/JaffaRIA/source/html/js/extjs/ext-overrides.js:1685-4877
Modified: branches/JAFFA_5_12_RELEASE/JaffaRIA/source/html/js/extjs/jaffa/component/PanelController.js
===================================================================
--- branches/JAFFA_5_12_RELEASE/JaffaRIA/source/html/js/extjs/jaffa/component/PanelController.js 2012-05-23 21:49:33 UTC (rev 6206)
+++ branches/JAFFA_5_12_RELEASE/JaffaRIA/source/html/js/extjs/jaffa/component/PanelController.js 2012-05-23 22:05:27 UTC (rev 6207)
@@ -943,7 +943,6 @@
f.displayRenderer= Jaffa.form.hyperlinkRenderer;
}
-<<<<<<< .working
if(Rules.get('Jaffa.metadata.HidePanelList')) {
var hidePanelList = Rules.get('Jaffa.metadata.HidePanelList').split(',');
if ((f.id || f.itemId) && (hidePanelList.indexOf(f.itemId)>=0 || hidePanelList.indexOf(f.id)>=0)){
@@ -954,18 +953,6 @@
if(Rules.get('Jaffa.metadata.HideFieldList')) {
var hideFieldList = Rules.get('Jaffa.metadata.HideFieldList').split(',');
if (f.mapping && hideFieldList.indexOf(f.mapping)>=0){
-=======
- if(Rules.get('Jaffa.metadata.HidePanelList')) {
- var hidePanelList = Rules.get('Jaffa.metadata.HidePanelList').split(',');
- if ((f.id || f.itemId) && (hidePanelList.indexOf(f.itemId)>=0 || hidePanelList.indexOf(f.id)>=0)){
- f.hide();
- f.hidden=true;
- }
- }
- if(Rules.get('Jaffa.metadata.HideFieldList')) {
- var hideFieldList = Rules.get('Jaffa.metadata.HideFieldList').split(',');
- if (f.mapping && hideFieldList.indexOf(f.mapping)>=0){
->>>>>>> .merge-right.r6201
if (f.rendered) {
f.hidden = true;
if (f.getEl().up('.x-form-item'))
Property changes on: branches/JAFFA_5_12_RELEASE/JaffaRIA/source/html/js/extjs/jaffa/component/PanelController.js
___________________________________________________________________
Added: svn:mergeinfo
+ /branches/JAFFA_2_1_0_RELEASE/JaffaRIA/source/html/js/extjs/jaffa/component/PanelController.js:3009-3735
/branches/JAFFA_4_1_0_RELEASE/JaffaRIA/source/html/js/extjs/jaffa/component/PanelController.js:3009-3734
/branches/JAFFA_5_0_0_RELEASE/JaffaRIA/source/html/js/extjs/jaffa/component/PanelController.js:3427-3733
/branches/JAFFA_5_10_RELEASE/JaffaRIA/source/html/js/extjs/jaffa/component/PanelController.js:5429-6204
/branches/JAFFA_5_11_RELEASE/JaffaRIA/source/html/js/extjs/jaffa/component/PanelController.js:5507-6112
/branches/JAFFA_5_1_0_RELEASE/JaffaRIA/source/html/js/extjs/jaffa/component/PanelController.js:3704-3732
/branches/JAFFA_5_7_RELEASE/JaffaRIA/source/html/js/extjs/jaffa/component/PanelController.js:4878-6102
/branches/JAFFA_5_8_RELEASE/JaffaRIA/source/html/js/extjs/jaffa/component/PanelController.js:5013-6200
/branches/JAFFA_5_9_RELEASE/JaffaRIA/source/html/js/extjs/jaffa/component/PanelController.js:5138-6104
/trunk/JaffaBuild/build/shared.ant.properties/JaffaRIA/source/html/js/extjs/jaffa/component/PanelController.js:1685-4877
Property changes on: branches/JAFFA_5_12_RELEASE/JaffaRIA/source/html/js/extjs/jaffa/finder/FinderComboBox.js
___________________________________________________________________
Added: svn:mergeinfo
+ /branches/JAFFA_2_1_0_RELEASE/JaffaRIA/source/html/js/extjs/jaffa/finder/FinderComboBox.js:3009-3735
/branches/JAFFA_4_1_0_RELEASE/JaffaRIA/source/html/js/extjs/jaffa/finder/FinderComboBox.js:3009-3734
/branches/JAFFA_5_0_0_RELEASE/JaffaRIA/source/html/js/extjs/jaffa/finder/FinderComboBox.js:3427-3733
/branches/JAFFA_5_10_RELEASE/JaffaRIA/source/html/js/extjs/jaffa/finder/FinderComboBox.js:5429-6204
/branches/JAFFA_5_11_RELEASE/JaffaRIA/source/html/js/extjs/jaffa/finder/FinderComboBox.js:5507-6112
/branches/JAFFA_5_1_0_RELEASE/JaffaRIA/source/html/js/extjs/jaffa/finder/FinderComboBox.js:3704-3732
/branches/JAFFA_5_7_RELEASE/JaffaRIA/source/html/js/extjs/jaffa/finder/FinderComboBox.js:4878-6102
/branches/JAFFA_5_8_RELEASE/JaffaRIA/source/html/js/extjs/jaffa/finder/FinderComboBox.js:5013-6200
/branches/JAFFA_5_9_RELEASE/JaffaRIA/source/html/js/extjs/jaffa/finder/FinderComboBox.js:5138-6104
/trunk/JaffaBuild/build/shared.ant.properties/JaffaRIA/source/html/js/extjs/jaffa/finder/FinderComboBox.js:1685-4877
Modified: branches/JAFFA_5_12_RELEASE/JaffaRIA/source/html/js/extjs/jaffa/finder/FinderComboGrid.js
===================================================================
--- branches/JAFFA_5_12_RELEASE/JaffaRIA/source/html/js/extjs/jaffa/finder/FinderComboGrid.js 2012-05-23 21:49:33 UTC (rev 6206)
+++ branches/JAFFA_5_12_RELEASE/JaffaRIA/source/html/js/extjs/jaffa/finder/FinderComboGrid.js 2012-05-23 22:05:27 UTC (rev 6207)
@@ -168,8 +168,8 @@
//if the finderComboGrid is an Ext.Editor field and is valid then stopEditing
completeEditing: function(){
- if (this.parentGrid && this.parentGrid.activeEditor && this.parentGrid.activeEditor.field && (this.parentGrid.activeEditor.field instanceof Jaffa.form.FinderComboGrid)) {
- this.parentGrid.activeEditor.completeEdit(false,true);
+ if (this.parentGrid && this.parentGrid.activeEditor) {
+ this.parentGrid.activeEditor.completeEdit();
}
},
@@ -197,6 +197,7 @@
comboGridElement.fireEvent('change', comboGridElement, newValue, originalValue);
}
comboGridElement.window.close();
+ comboGridElement.completeEditing();
}
}
});
Modified: branches/JAFFA_5_12_RELEASE/JaffaRIA/source/html/js/extjs/jaffa/maintenance/plugins/Panel.js
===================================================================
--- branches/JAFFA_5_12_RELEASE/JaffaRIA/source/html/js/extjs/jaffa/maintenance/plugins/Panel.js 2012-05-23 21:49:33 UTC (rev 6206)
+++ branches/JAFFA_5_12_RELEASE/JaffaRIA/source/html/js/extjs/jaffa/maintenance/plugins/Panel.js 2012-05-23 22:05:27 UTC (rev 6207)
@@ -353,11 +353,7 @@
f.on('change', function(f, oldValue, newValue){
// add old value and new value comparison to allow this event also act like change event
// make sure that the ''==undefined==null in the test
-<<<<<<< .working
if (!this.isDirty && f.activated === true && f.textOnly !== true) {
-=======
- if (!this.isDirty && f.textOnly !== true) {
->>>>>>> .merge-right.r6201
onChangeFn.call(this);
}
}, this);
Property changes on: branches/JAFFA_5_12_RELEASE/JaffaRIA/source/html/js/extjs/jaffa/maintenance/plugins/Panel.js
___________________________________________________________________
Added: svn:mergeinfo
+ /branches/JAFFA_2_1_0_RELEASE/JaffaRIA/source/html/js/extjs/jaffa/maintenance/plugins/Panel.js:3009-3735
/branches/JAFFA_4_1_0_RELEASE/JaffaRIA/source/html/js/extjs/jaffa/maintenance/plugins/Panel.js:3009-3734
/branches/JAFFA_5_0_0_RELEASE/JaffaRIA/source/html/js/extjs/jaffa/maintenance/plugins/Panel.js:3427-3733
/branches/JAFFA_5_10_RELEASE/JaffaRIA/source/html/js/extjs/jaffa/maintenance/plugins/Panel.js:5429-6204
/branches/JAFFA_5_11_RELEASE/JaffaRIA/source/html/js/extjs/jaffa/maintenance/plugins/Panel.js:5507-6112
/branches/JAFFA_5_1_0_RELEASE/JaffaRIA/source/html/js/extjs/jaffa/maintenance/plugins/Panel.js:3704-3732
/branches/JAFFA_5_7_RELEASE/JaffaRIA/source/html/js/extjs/jaffa/maintenance/plugins/Panel.js:4878-6102
/branches/JAFFA_5_8_RELEASE/JaffaRIA/source/html/js/extjs/jaffa/maintenance/plugins/Panel.js:5013-6200
/branches/JAFFA_5_9_RELEASE/JaffaRIA/source/html/js/extjs/jaffa/maintenance/plugins/Panel.js:5138-6104
/trunk/JaffaBuild/build/shared.ant.properties/JaffaRIA/source/html/js/extjs/jaffa/maintenance/plugins/Panel.js:1685-4877
Modified: branches/JAFFA_5_12_RELEASE/JaffaRIA/source/html/js/extjs/jaffa/metadata/rules.jsp
===================================================================
--- branches/JAFFA_5_12_RELEASE/JaffaRIA/source/html/js/extjs/jaffa/metadata/rules.jsp 2012-05-23 21:49:33 UTC (rev 6206)
+++ branches/JAFFA_5_12_RELEASE/JaffaRIA/source/html/js/extjs/jaffa/metadata/rules.jsp 2012-05-23 22:05:27 UTC (rev 6207)
@@ -94,17 +94,10 @@
String identifierText = (identifier==null||identifier.equals(""))?"":("." + identifier);
-<<<<<<< .working
String hidePanelListRule = rulePath+identifierText+".hidePanelList";
String hideColumnListRule = rulePath+identifierText+".hideColumnList";
String hideFieldListRule = rulePath+identifierText+".hideFieldList";
String readOnlyFieldListRule = rulePath+identifierText+".readOnlyFieldList";
-=======
-String hidePanelListRule = rulePath+identifierText+".HidePanelList";
-String hideColumnListRule = rulePath+identifierText+".HideColumnList";
-String hideFieldListRule = rulePath+identifierText+".HideFieldList";
-String readOnlyFieldListRule = rulePath+identifierText+".ReadOnlyFieldList";
->>>>>>> .merge-right.r6201
String hidePanelList = (String)ContextManagerFactory.instance().getProperty(hidePanelListRule);
String hideColumnList = (String)ContextManagerFactory.instance().getProperty(hideColumnListRule);
Property changes on: branches/JAFFA_5_12_RELEASE/JaffaRIA/source/html/js/extjs/jaffa/metadata/rules.jsp
___________________________________________________________________
Added: svn:mergeinfo
+ /branches/JAFFA_2_1_0_RELEASE/JaffaRIA/source/html/js/extjs/jaffa/metadata/rules.jsp:3009-3735
/branches/JAFFA_4_1_0_RELEASE/JaffaRIA/source/html/js/extjs/jaffa/metadata/rules.jsp:3009-3734
/branches/JAFFA_5_0_0_RELEASE/JaffaRIA/source/html/js/extjs/jaffa/metadata/rules.jsp:3427-3733
/branches/JAFFA_5_10_RELEASE/JaffaRIA/source/html/js/extjs/jaffa/metadata/rules.jsp:5429-6204
/branches/JAFFA_5_11_RELEASE/JaffaRIA/source/html/js/extjs/jaffa/metadata/rules.jsp:5507-6112
/branches/JAFFA_5_1_0_RELEASE/JaffaRIA/source/html/js/extjs/jaffa/metadata/rules.jsp:3704-3732
/branches/JAFFA_5_7_RELEASE/JaffaRIA/source/html/js/extjs/jaffa/metadata/rules.jsp:4878-6102
/branches/JAFFA_5_8_RELEASE/JaffaRIA/source/html/js/extjs/jaffa/metadata/rules.jsp:5013-6200
/branches/JAFFA_5_9_RELEASE/JaffaRIA/source/html/js/extjs/jaffa/metadata/rules.jsp:5138-6104
/trunk/JaffaBuild/build/shared.ant.properties/JaffaRIA/source/html/js/extjs/jaffa/metadata/rules.jsp:1685-4877
Modified: branches/JAFFA_5_12_RELEASE/JaffaRIA/source/html/js/extjs/ux/form/HtmlEditorWithView.js
===================================================================
--- branches/JAFFA_5_12_RELEASE/JaffaRIA/source/html/js/extjs/ux/form/HtmlEditorWithView.js 2012-05-23 21:49:33 UTC (rev 6206)
+++ branches/JAFFA_5_12_RELEASE/JaffaRIA/source/html/js/extjs/ux/form/HtmlEditorWithView.js 2012-05-23 22:05:27 UTC (rev 6207)
@@ -151,8 +151,6 @@
this.fireEvent('sync', this, html);
}
var newVal = this.el.dom.value;
- if(oldVal) oldVal = oldVal.trim();
- if(newVal) newVal = newVal.trim();
if (oldVal !== newVal) {
this.fireEvent('change', this, oldVal, newVal);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|