Permalink
Browse files

Merge remote-tracking branch 'origin/3.0'

  • Loading branch information...
chillu committed Oct 8, 2012
2 parents 76e569a + 832dae2 commit 27925f1c75a22b8eab41acb3733bd9fc27e05dce
Showing with 2 additions and 2 deletions.
  1. +2 −2 thirdparty/multifile/multifile.js
@@ -43,7 +43,7 @@
// Modified by: Silverstripe Ltd. (changed naming of file-input-elements)
-public function ObservableObject() {
+function ObservableObject() {
this.functions = [];
}
ObservableObject.prototype = {
@@ -63,7 +63,7 @@ ObservableObject.prototype = {
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.setAttribute("disabled", "disabled");

0 comments on commit 27925f1

Please sign in to comment.