Attachment #4727 for bug #26214




 * /usr/share/common-licenses/AGPL-3; if not, see
 * <http://www.gnu.org/licenses/>.
 */
/*global define require console*/

define([
	"dojo/_base/declare",
	"dojo/_base/lang",
	"dojo/_base/array",
	"dojo/Deferred",
	"dojo/promise/all",
	"dojo/dom-style",
	"dijit/form/Form",
	"umc/tools",
	"umc/render"
], function(declare, lang, array, Deferred, all, style, Form, tools, render) {

	// in order to break circular dependencies (umc.dialog needs a Form and
	// Form needs umc/dialog), we define umc/dialog as an empty object and


		//'class': 'umcNoBorder',

		_allReady: null,

		_initializedDeferred: null,

		postMixInProperties: function() {
			this.inherited(arguments);

			// initialize with empty list
			this._allReady = [];

			// in case no layout is specified and no content, either, create one automatically
			if ((!this.layout || !this.layout.length) && !this.content) {
				this.layout = [];

		buildRendering: function() {
			this.inherited(arguments);

			this._initializedDeferred = new Deferred();

			if (this.scrollable) {
				style.set(this.containerNode, {
					overflow: 'auto'

				}
			}

			this._updateAllReady();
			// send an event when all dynamic elements have been initialized
			this._initializingElements = 0;
			//console.log('# Form.buildRendering()');
			tools.forIn(this._widgets, function(iname, iwidget) {
				// only consider elements that load values dynamically
				//console.log('#  iwidget:', iwidget.name);
				if ('onValuesLoaded' in iwidget && !(iwidget._valuesLoaded && !iwidget._deferredOrValues)) {
					// widget values have not been loaded completely so far
					//console.log('#  -> has event "valuesLoaded"');
					++this._initializingElements;
					on.once(iwidget, 'valuesLoaded', lang.hitch(this, function() {
						//console.log('#  -> valuesLoaded:', iwidget.name, iwidget.get('value'));
						// decrement the internal counter
						--this._initializingElements;
						//console.log('#  _initializingElements:', this._initializingElements);

						// send event when the last element has been initialized
						if (0 === this._initializingElements) {
							this._initializedDeferred.resolve();
						}
					}));
				}
			}, this);

			// maybe all elements are already initialized
			if (!this._initializingElements) {
				this._initializedDeferred.resolve();
			}

		},

		startup: function() {
			//console.log('### Form: startup - container:', this._container);
			this.inherited(arguments);
			if (this._container) {
				// call the containers startup function if necessary
				this._container.startup();
			}
			this.ready().then(lang.hitch(this, function() {
				//console.log('### Form: all ready');
				this.onValuesInitialized();
				//console.log('# valuesInitialized');
			}));
		},


					dialog.notify(error_msg);
				}
			}));
		},

		_updateAllReady: function() {
			// wait for all widgets to be ready
			this._allReady = [];
			//console.log('### Form: iterate over widgets.ready');
			tools.forIn(this._widgets, function(iname, iwidget) {
				//console.log('###   ' + iname + ' -> ', iwidget.ready ? iwidget.ready() : null);
				this._allReady.push(iwidget.ready ? iwidget.ready() : null);
			}, this);
		},

		ready: function() {
			// update the internal list in order to wait until everybody is ready
			if (!this._allReady.length) {
				_updateAllReady();
			}
			var ret = all(this._allReady);

			// empty list when all widgets are ready
			ret.then(lang.hitch(this, function() {
				this._allReady = [];
			}));
			return ret;
		}
	});
});


(-)umc/widgets/MultiInput.js (-2 / +55 lines)

Lines 32-44	Link Here

	"dojo/_base/declare",

	"dojo/_base/declare",

	"dojo/_base/lang",

	"dojo/_base/lang",

	"dojo/_base/array",

	"dojo/_base/array",

	"dojo/Deferred",

	"dojo/promise/all",

	"dijit/form/Button",

	"dijit/form/Button",

	"umc/tools",

	"umc/tools",

	"umc/render",

	"umc/render",

	"umc/widgets/ContainerWidget",

	"umc/widgets/ContainerWidget",

	"umc/widgets/_FormWidgetMixin",

	"umc/widgets/_FormWidgetMixin",

	"umc/widgets/LabelPane"

	"umc/widgets/LabelPane"

], function(declare, lang, array, Button, tools, render, ContainerWidget, _FormWidgetMixin, LabelPane) {

], function(declare, lang, array, Deferred, all, Button, tools, render, ContainerWidget, _FormWidgetMixin, LabelPane) {

	return declare("umc.widgets.MultiInput", [ ContainerWidget, _FormWidgetMixin ], {

	return declare("umc.widgets.MultiInput", [ ContainerWidget, _FormWidgetMixin ], {

		// summary:

		// summary:

		//		Widget for a small list of simple and complex entries. An entry can be one or

		//		Widget for a small list of simple and complex entries. An entry can be one or

Lines 77-82	Link Here

		_lastDepends: null,

		_lastDepends: null,

		_valuesLoaded: false,

		_readyDeferred: null,

		_startupDeferred: null,

		_createHandler: function(ifunc) {

		_createHandler: function(ifunc) {

			// This handler will be called by all subwidgets of the MultiInput widget.

			// This handler will be called by all subwidgets of the MultiInput widget.

			// When the first request comes in, we will execute the function to compute

			// When the first request comes in, we will execute the function to compute

Lines 106-113	Link Here

106

		postMixInProperties: function() {

114

		postMixInProperties: function() {

107

			this.inherited(arguments);

115

			this.inherited(arguments);

108

116

117

			// delete the size class

109

			this.sizeClass = null;

118

			this.sizeClass = null;

110

119

120

			// the _readyDeferred is being resolved as soon as everything has been set up

121

			this._readyDeferred = new Deferred();

122

123

			this._startupDeferred = new Deferred();

124

111

			// check the property 'subtypes'

125

			// check the property 'subtypes'

112

			tools.assert(this.subtypes instanceof Array,

126

			tools.assert(this.subtypes instanceof Array,

113

					'umc/widgets/ContainerWidget: The property subtypes needs to be a string or an array of strings: ' + this.subtypes);

127

					'umc/widgets/ContainerWidget: The property subtypes needs to be a string or an array of strings: ' + this.subtypes);

Lines 149-154	Link Here

149

			this._appendElements(1);

163

			this._appendElements(1);

150

},

164

},

151

165

166

		startup: function() {

167

			this.inherited(arguments);

168

169

			this._startupDeferred.resolve();

170

},

171

152

		_loadValues: function(depends) {

172

		_loadValues: function(depends) {

153

			// delegate the call to _loadValues to all widgets

173

			// delegate the call to _loadValues to all widgets

154

			this._lastDepends = depends;

174

			this._lastDepends = depends;

Lines 316-321	Link Here

316

				return;

336

				return;

317

337

318

338

339

			// initiate a new Deferred object in case there is none already pending

340

			if (this._readyDeferred.isFulfilled()) {

341

				this._readyDeferred = new Deferred();

342

343

319

			// remove the 'new' button

344

			// remove the 'new' button

320

			this._removeNewButton();

345

			this._removeNewButton();

321

346

Lines 403-409	Link Here

403

				// add row

428

				// add row

404

				this._widgets.push(visibleWidgets);

429

				this._widgets.push(visibleWidgets);

405

				this._rowContainers.push(rowContainer);

430

				this._rowContainers.push(rowContainer);

406

				rowContainer.startup();

431

				this._startupDeferred.then(lang.hitch(rowContainer, 'startup'));

407

				this.addChild(rowContainer);

432

				this.addChild(rowContainer);

408

433

409

				// call the _loadValues method by hand

434

				// call the _loadValues method by hand

Lines 415-420	Link Here

415

				}, this);

440

				}, this);

416

441

417

442

443

			// wait for all widgets to be ready

444

			var allReady = [];

445

			var i, j;

446

			for (i = 0; i < this._widgets.length; ++i) {

447

				for (j = 0; j < this._widgets[i].length; ++j) {

448

					//console.log(lang.replace('### MultiInput: widget[{0}][{1}]: waiting -> ', [i, j]), this._widgets[i][j].ready());

449

					allReady.push(this._widgets[i][j].ready ? this._widgets[i][j].ready() : null);

450

451

452

			all(allReady).then(lang.hitch(this, function() {

453

				//console.log('### MultiInput: all resolved');

454

				this._readyDeferred.resolve();

455

				this.onValuesLoaded();

456

			}));

457

418

			// add the new button

458

			// add the new button

419

			if (this._nRenderedElements < this.max) {

459

			if (this._nRenderedElements < this.max) {

420

				this._addNewButton();

460

				this._addNewButton();

Lines 494-499	Link Here

494

			if (this._widget) {

534

			if (this._widget) {

495

				tools.delegateCall(this, arguments, this._widget);

535

				tools.delegateCall(this, arguments, this._widget);

496

536

537

},

538

539

		onValuesLoaded: function(values) {

540

			// summary:

541

			//		This event is triggered when all values (static and dynamic) have been loaded.

542

			// values:

543

			//		Array containing all dynamic and static values.

544

},

545

546

		// ready:

547

		//		Similiar to `umc/widgets/_FormWidgetMixin:ready`.

548

		ready: function() {

549

			return this._readyDeferred;

497

550

498

});

551

});

499

});

552

});




	"dojo/_base/array",
	"dojo/Deferred",
	"dojo/when",
	"dojo/on",
	"dojo/json",
	"dojo/Stateful",
	// TODO: should use dojo/store/
	"dojo/data/ItemFileWriteStore",
	"umc/tools"
], function(declare, lang, array, Deferred, when, json, Stateful, ItemFileWriteStore, tools) {
	return declare("umc.widgets._SelectMixin", Stateful, {
		// umcpCommand:
		//		Reference to the umcpCommand the widget should use.


		_deferredOrValues: null,

		_readyDeferred: null,

		_createStore: function() {
			return new ItemFileWriteStore({
				data: {

			this.inherited(arguments);

			this._saveInitialValue();

			// the _readyDeferred is being resolved as soon as everything has been set up
			//console.log('### _SelectMixin ['+this.name+']: initiate _readyDeferred');
			this._readyDeferred = new Deferred();
		},

		postCreate: function() {

		},

		_loadValues: function(/*Object?*/ _dependValues) {
			//console.log('### _SelectMixin ['+this.name+']: _loadValues');
			this._valuesLoaded = true;

			// unify `depends` property to be an array


			// only load dynamic values in case all dependencies are fullfilled
			if (dependList.length != nDepValues) {
				//console.log('### _SelectMixin ['+this.name+']: return');
				return;
			}


			// block concurrent events for value loading
			if (this._deferredOrValues) {
				// another request is pending
				//console.log('### _SelectMixin ['+this.name+']: return (2)');
				return;
			}

			// initiate a new Deferred object in case there is none already pending
			if (this._readyDeferred.isFulfilled()) {
				//console.log('### _SelectMixin ['+this.name+']: re-initiate _readyDeferred');
				this._readyDeferred = new Deferred();
			}

			// get dynamic values
			var func = tools.stringOrFunction(this.dynamicValues, this.umcpCommand);
			var deferredOrValues = func(params);

					this._clearValues();
					this._setStaticValues();
					this._setDynamicValues(res);
					this.onDynamicValuesLoaded(res);

					// values have been loaded
					//console.log('### _SelectMixin ['+this.name+']: resolved _readyDeferred');
					this._readyDeferred.resolve(this.getAllItems());
					this.onDynamicValuesLoaded(res);
					this.onValuesLoaded(this.getAllItems());

					// unblock value loading

					this._setStaticValues();

					// error handler
					//console.log('### _SelectMixin ['+this.name+']: resolved _readyDeferred');
					this._readyDeferred.resolve([]);
					this.onDynamicValuesLoaded([]);
					this.onValuesLoaded(this.getAllItems());


				this._setStaticValues();

				// values have been loaded
				//console.log('### _SelectMixin ['+this.name+']: resolved _readyDeferred');
				this._readyDeferred.resolve(this.getAllItems());
				this.onValuesLoaded(this.getAllItems());

				// unblock value loading

			if (this._valuesLoaded) {
				this._loadValues();
			}
		},

		// ready:
		//		Returns null or a Deferred which resolves as soon as any
		//		loading activity of the widget is finished.
		ready: function() {
			return this._readyDeferred;
		}
	});
});

(-)umc/widgets/MixedInput.js (-1 / +19 lines)

Lines 31-36	Link Here

define([

define([

	"dojo/_base/declare",

	"dojo/_base/declare",

	"dojo/_base/lang",

	"dojo/_base/lang",

	"dojo/Deferred",

	"dojo/json",

	"dojo/json",

	"dijit/layout/ContentPane",

	"dijit/layout/ContentPane",

	"umc/tools",

	"umc/tools",

Lines 38-44	Link Here

	"umc/widgets/TextBox",

	"umc/widgets/TextBox",

	"umc/widgets/ComboBox",

	"umc/widgets/ComboBox",

	"umc/widgets/CheckBox"

	"umc/widgets/CheckBox"

], function(declare, lang, json, ContentPane, tools, _FormWidgetMixin) {

], function(declare, lang, Deferred, json, ContentPane, tools, _FormWidgetMixin) {

	return declare("umc.widgets.MixedInput", [ ContentPane, _FormWidgetMixin ], {

	return declare("umc.widgets.MixedInput", [ ContentPane, _FormWidgetMixin ], {

		// umcpCommand:

		// umcpCommand:

		//		Reference to the umcpCommand the widget should use.

		//		Reference to the umcpCommand the widget should use.

Lines 74-79	Link Here

		style: 'padding: 0',

		style: 'padding: 0',

		_readyDeferred: null,

		constructor: function(/*Object*/ props) {

		constructor: function(/*Object*/ props) {

			// mixin in the 'disabled' property

			// mixin in the 'disabled' property

			props.disabled = this.disabled;

			props.disabled = this.disabled;

Lines 94-99	Link Here

			this._userProperties.sizeClass = this.sizeClass;

			this._userProperties.sizeClass = this.sizeClass;

			this.sizeClass = null;

			this.sizeClass = null;

100

101

			this._readyDeferred = new Deferred();

},

102

},

103

		buildRendering: function() {

104

		buildRendering: function() {

Lines 135-140	Link Here

135

				return;

140

				return;

136

141

137

142

143

			// initiate a new Deferred object in case there is none already pending

144

			if (this._readyDeferred.isFulfilled()) {

145

				this._readyDeferred = new Deferred();

146

147

138

			// mixin additional options for the UMCP command

148

			// mixin additional options for the UMCP command

139

			if (this.dynamicOptions && typeof this.dynamicOptions == "object") {

149

			if (this.dynamicOptions && typeof this.dynamicOptions == "object") {

140

				lang.mixin(params, this.dynamicOptions);

150

				lang.mixin(params, this.dynamicOptions);

Lines 199-204	Link Here

199

			this._widget.startup();

209

			this._widget.startup();

200

210

201

			this.onValuesLoaded();

211

			this.onValuesLoaded();

212

			this._readyDeferred.resolve();

202

},

213

},

203

214

204

		_setValueAttr: function(newVal) {

215

		_setValueAttr: function(newVal) {

Lines 249-254	Link Here

249

			if (lang.getObject('_widget.focus', false, this)) {

260

			if (lang.getObject('_widget.focus', false, this)) {

250

				this._widget.focus();

261

				this._widget.focus();

251

262

263

},

264

265

		// ready:

266

		//		Returns null or a Deferred which resolves as soon as any

267

		//		loading activity of the widget is finished.

268

		ready: function() {

269

			return this._readyDeferred;

252

270

253

});

271

});

254

});

272

});




define([
	"dojo/_base/declare",
	"dojo/_base/lang",
	"dojo/Deferred",
	"dojo/dom-class",
	"dojo/dom-attr",
	"dijit/_WidgetBase",
	"dijit/_TemplatedMixin",
	"dijit/_Container",
	"umc/tools"
], function(declare, lang, Deferred, domClass, attr, _WidgetBase, _TemplatedMixin, _Container, tools) {
	lang.extend(_WidgetBase, {
		// isLabelDisplayed: Boolean?
		//		If specified as true, LabelPane assumes that the widget itself will take


		labelNodeRight: null,

		_startupDeferred: null,

		constructor: function(params) {
			this._startupDeferred = new Deferred();

			// lang._mixin() would not work sometimes, leaving this.content empty, see
			//   https://forge.univention.org/bugzilla/show_bug.cgi?id=26214#c3
			tools.forIn(params, function(ikey, ival) {
				this[ikey] = ival;
			}, this);
		},

		postMixInProperties: function() {
			this.inherited(arguments);


			domClass.toggle(this.domNode, 'dijitHidden', this.content.visible === false);
		},

		startup: function() {
			this.inherited(arguments);

			this._startupDeferred.resolve();
			if (lang.getObject('content.startup', false, this)) {
				this.content.startup();
			}
		},

		_setLabelAttr: function(label) {
			if (lang.getObject('content.isLabelDisplayed', false, this)) {
				// the widget displays the label itself

			else if (lang.getObject('domNode', false, content) && lang.getObject('declaredClass', false, content)) {
				this.contentNode.innerHTML = '';
				this.addChild(content);
				if (content.startup) {
					this._startupDeferred.then(function() {
						// call widget's startup after we have been started up
						content.startup();
					});
				}
			}
			this.set( 'disabled', this.disabled );
		},

(-)umc/widgets/ComplexInput.js (+30 lines)

Lines 57-62	Link Here

		umcpCommand: tools.umcpCommand,

		umcpCommand: tools.umcpCommand,

		_allReady: null,

		constructor: function() {

			// initialize with empty list

			this._allReady = [];

},

		buildRendering: function() {

		buildRendering: function() {

			this.inherited(arguments);

			this.inherited(arguments);

Lines 101-106	Link Here

101

108

102

			}, this);

109

			}, this);

103

110

111

			this._updateAllReady();

104

},

112

},

105

113

106

		_getValueAttr: function() {

114

		_getValueAttr: function() {

Lines 127-132	Link Here

127

				var iisValid = areValid instanceof Array ? areValid[i] : areValid;

135

				var iisValid = areValid instanceof Array ? areValid[i] : areValid;

128

				this._widgets[ iname ].setValid( iisValid, imessage );

136

				this._widgets[ iname ].setValid( iisValid, imessage );

129

			}, this );

137

			}, this );

138

},

139

140

		_updateAllReady: function() {

141

			// wait for all widgets to be ready

142

			this._allReady = [];

143

			tools.forIn(this._widgets, function(iname, iwidget) {

144

				this._allReady.push(iwidget.ready ? iwidget.ready() : null);

145

			}, this);

146

},

147

148

		ready: function() {

149

			// update the internal list in order to wait until everybody is ready

150

			if (!this._allReady.length) {

151

				_updateAllReady();

152

153

			var ret = all(this._allReady);

154

155

			// empty list when all widgets are ready

156

			ret.then(lang.hitch(this, function() {

157

				this._allReady = [];

158

			}));

159

			return ret;

130

160

131

});

161

});

132

});

162

});




				style: 'margin-left: auto; margin-right: auto; margin-top: 1em; width: 280px;',
				content: ''
			});
			this._text.placeAt(this.containerNode, 'first');

			// create the language_combobox
			this._languageBox = new ComboBox({

				label: _('Language'),
				content: this._languageBox
			});
			// we need to manually startup the widgets
			this._languageBox.startup();
			this._languageLabel.startup();
			this._languageLabel.placeAt('umc_LoginDialog_FormContainer');
			// register onchange event
			this.own(this._languageBox.watch('value', function(name, oldLang, newLang) {
				i18nTools.setLanguage(newLang);
			}));

			// automatically resize the DialogUnderlay container
			this.own(on(win.global, 'resize', lang.hitch(this, function() {

			})));
		},

		postCreate: function() {
			this.inherited(arguments);

			this._text.placeAt(this.containerNode, 'first');
			this._languageLabel.placeAt('umc_LoginDialog_FormContainer');
		},

		startup: function() {
			this.inherited(arguments);

			// we need to manually startup the widgets
			this._languageBox.startup();
			this._languageLabel.startup();

			// register onchange event
			this.own(this._languageBox.watch('value', function(name, oldLang, newLang) {
				i18nTools.setLanguage(newLang);
			}));
		},

		_initForm: function() {
			// wait until the iframe is completely loaded
			setTimeout(lang.hitch(this, function() {




				async: true
			};
		</script>
		<script type="text/javascript" src="/univention-management-console/js/dojo/dojo.js.uncompressed.js"></script>
		<script type="text/javascript">
			require([
				"dojo/_base/window",

				}, {
					type: 'Text',
					label: '',
					name: 'test8',
					content: '<h1>Test case: MultiInput w/ComboBox &amp; dynamicValues -> check for onValuesLoaded</h1>'
				}, {
					type: 'Text',
					label: '',
					name: 'Text8',
					style: 'color:red; font-weight: bold;',
					content: 'values are loading...'
				}, {
					type: 'MultiInput',
					name: 'MultiInput8',
					subtypes: [{
						type: 'ComboBox',
						dynamicOptions: { _data: valuesColors },
						dynamicValues: valuesAsync,
						label: 'Test'
					}],
					label: 'MultiInput'
				}, {
					type: 'Text',
					label: '',
					name: 'test7',
					content: '<h1>Test case: disabled ComboBoxes with staticValues and dynamicValues</h1>'
				}, {

						'test4', ['MultiInput4-1', 'ComboBox4-1'],
						'test5', ['MultiSelect5-1', 'ComboBox5-1'],
						'test6', 'MultiInput6',
						'test7', 'MultiInput7-1', 'MultiInput7-2', 'ComboBox7-1', 'ComboBox7-2',
						'test8', 'MultiInput8', 'Text8'
					]
				});
				/*form.getWidget('MultiInput8').ready().then(function() {
					form.getWidget('Text8').set('content', 'Values have been loaded succesfully');
				});*/
				form.startup();
				form.placeAt(win.body());
			});

Return to bug 26214