View | Details | Raw Unified | Return to bug 26214 | Differences between
and this patch

Collapse All | Expand All

(-)umc/js/udm/ComboBox.js (+4 lines)
 Lines 164-169    Link Here 
164
							}
164
							}
165
						}));
165
						}));
166
						this._tooManyDeferred.resolve(true);
166
						this._tooManyDeferred.resolve(true);
167
168
						// we wait until the info command has been sent ... the user will
169
						// during a request see a waiting animation
170
						this._readyDeferred.resolve();
167
					} else {
171
					} else {
168
						this._behaveNormally();
172
						this._behaveNormally();
169
					}
173
					}
(-)umc/js/udm.js (-5 / +4 lines)
 Lines 278-284    Link Here 
278
				headerText: this.description,
278
				headerText: this.description,
279
				helpText: ''
279
				helpText: ''
280
			});
280
			});
281
			this.addChild(this._searchPage);
282
			var titlePane = new ExpandingTitlePane({
281
			var titlePane = new ExpandingTitlePane({
283
				title: _('Search for %s', this.objectNamePlural),
282
				title: _('Search for %s', this.objectNamePlural),
284
				design: 'sidebar'
283
				design: 'sidebar'
 Lines 696-711    Link Here 
696
				titlePane.addChild(treePane);
695
				titlePane.addChild(treePane);
697
			}
696
			}
698
697
699
			this._searchPage.startup();
700
701
			// register to onShow as well as onFilterDone events in order on focus to the
698
			// register to onShow as well as onFilterDone events in order on focus to the
702
			// input widget when the tab is changed
699
			// input widget when the tab is changed
703
			this._searchPage.on('show', lang.hitch(this, '_selectInputText'));
700
			this._searchPage.on('show', lang.hitch(this, '_selectInputText'));
704
			this._grid.on('filterDone', lang.hitch(this, '_selectInputText'));
701
			this._grid.on('filterDone', lang.hitch(this, '_selectInputText'));
705
702
706
			// register event to update hiding/showing of form fields
703
			// register event to update hiding/showing of form fields
707
			var objTypeWidget = this._searchForm._widgets.objectType;
704
			this._searchForm.ready().then(lang.hitch(this,  '_updateSearch'));
708
			objTypeWidget.on('valuesLoaded', lang.hitch(this,  '_updateSearch'));
709
705
710
			// reload the superordinates in case an object has been added, it might be a new superordinate
706
			// reload the superordinates in case an object has been added, it might be a new superordinate
711
			if (superordinates && superordinates.length) {
707
			if (superordinates && superordinates.length) {
 Lines 790-795    Link Here 
790
				// create report button
786
				// create report button
791
				this._grid.on('filterDone', lang.hitch(this, '_checkReportButton'));
787
				this._grid.on('filterDone', lang.hitch(this, '_checkReportButton'));
792
			}
788
			}
789
790
			this._searchPage.startup();
791
			this.addChild(this._searchPage);
793
		},
792
		},
794
793
795
		_selectInputText: function() {
794
		_selectInputText: function() {

Return to bug 26214