Merge remote-tracking branch 'origin/3.0'

This commit is contained in:
Ingo Schommer 2012-10-08 16:48:57 +02:00
commit 27925f1c75

View File

@ -43,7 +43,7 @@
// Modified by: Silverstripe Ltd. (changed naming of file-input-elements) // Modified by: Silverstripe Ltd. (changed naming of file-input-elements)
public function ObservableObject() { function ObservableObject() {
this.functions = []; this.functions = [];
} }
ObservableObject.prototype = { ObservableObject.prototype = {
@ -63,7 +63,7 @@ ObservableObject.prototype = {
var MultiSelectorObserver = new ObservableObject(); var MultiSelectorObserver = new ObservableObject();
public function MultiSelector( list_target, max, upload_button ){ function MultiSelector( list_target, max, upload_button ){
this.upload_button = upload_button; this.upload_button = upload_button;
this.upload_button.setAttribute("disabled", "disabled"); this.upload_button.setAttribute("disabled", "disabled");