Attachment 4320 Details for Bug 26780

[patch] umc-frontend.patch

umc.patch (text/plain), 2.15 KB, created by Florian Best on 2012-04-13 11:16 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: Florian Best

Created: 2012-04-13 11:16 CEST

Size: 2.15 KB

patch

obsolete

>Index: univention-management-console-frontend/umc/widgets/Form.js
>===================================================================
>--- univention-management-console-frontend/umc/widgets/Form.js	(Revision 31953)
>+++ univention-management-console-frontend/umc/widgets/Form.js	(Arbeitskopie)
>@@ -111,6 +111,8 @@
> 
> 	_initializingElements: 0,
> 
>+	_initializedDeferred: null,
>+
> 	postMixInProperties: function() {
> 		this.inherited(arguments);
> 
>@@ -169,6 +171,8 @@
> 	buildRendering: function() {
> 		this.inherited(arguments);
> 
>+		this._initializedDeferred = new dojo.Deferred();
>+
> 		if (this.scrollable) {
> 			dojo.style(this.containerNode, {
> 				overflow: 'auto'
>@@ -210,6 +214,7 @@
> 			}
> 		}
> 
>+
> 		// send an event when all dynamic elements have been initialized
> 		this._initializingElements = 0;
> 		umc.tools.forIn(this._widgets, function(iname, iwidget) {
>@@ -228,7 +233,7 @@
> 
> 					// send event when the last element has been initialized
> 					if (0 === this._initializingElements) {
>-						this.onValuesInitialized();
>+						this._initializedDeferred.resolve();
> 					}
> 				}));
> 			}
>@@ -236,10 +241,18 @@
> 
> 		// maybe all elements are already initialized
> 		if (!this._initializingElements) {
>-			this.onValuesInitialized();
>+			this._initializedDeferred.resolve();
> 		}
>+
> 	},
> 
>+	startup: function() {
>+		this.inherited(arguments);
>+		this._initializedDeferred.then(dojo.hitch(this, function(result) {
>+			this.onValuesInitialized();
>+		}));
>+	},
>+
> 	postCreate: function() {
> 		this.inherited(arguments);
> 
>Index: univention-management-console-frontend/umc/widgets/MultiObjectSelect.js
>===================================================================
>--- univention-management-console-frontend/umc/widgets/MultiObjectSelect.js	(Revision 32074)
>+++ univention-management-console-frontend/umc/widgets/MultiObjectSelect.js	(Arbeitskopie)
>@@ -55,7 +55,14 @@
> 	// 'javascript:functionName'
> 	// function(ids) { ... }
> 	// may return dojo.Deferred
>-	formatter: function(ids) { return ids; },
>+	formatter: function(ids) {
>+		dojo.forEach(ids, function(id, i) {
>+			if (dojo.isString(id)) {
>+				ids[i] = {label: id, id: id};
>+			}
>+		});
>+		return ids;
>+	},
> 
> 	autoSearch: true,
>

Actions: View | Diff

Attachments on bug 26780: 4320