Merge branch 'dev' of https://github.com/Airistotal/galaxy into Repor…

…ts_pages
galaxyproject · Aug 11, 2015 · 21ab4d2 · 21ab4d2
2 parents d6ef045 + a04147d
commit 21ab4d2
Show file tree

Hide file tree

Showing 71 changed files with 1,528 additions and 572 deletions.
diff --git a/client/galaxy/scripts/mvc/upload/upload-view.js b/client/galaxy/scripts/mvc/upload/upload-view.js
@@ -641,22 +641,30 @@ return Backbone.View.extend({
         */
 
         // update reset button
-        if (this.counter.running == 0 && this.counter.announce + this.counter.success + this.counter.error > 0)
+        if (this.counter.running == 0 && this.counter.announce + this.counter.success + this.counter.error > 0){
             this.modal.enableButton('Reset');
-        else
+        }
+        else{
             this.modal.disableButton('Reset');
+        }
 
         // update upload button
-        if (this.counter.running == 0 && this.counter.announce > 0)
+        if (this.counter.running == 0 && this.counter.announce > 0){
             this.modal.enableButton('Start');
-        else
+            $('#button-3').addClass('btn-primary');
+        }
+        else {
             this.modal.disableButton('Start');
+            $('#button-3').removeClass('btn-primary');
+        }
 
         // pause upload button
-        if (this.counter.running > 0)
+        if (this.counter.running > 0){
             this.modal.enableButton('Pause');
-        else
+        }
+        else{
             this.modal.disableButton('Pause');
+        }
 
         // select upload button
         if (this.counter.running == 0){