svn commit: r1489663 - in /incubator/climate/trunk/rcmet/src/main/ui/app: index.html js/controllers.js

[joyce]

Author: joyce
Date: Tue Jun  4 22:54:06 2013
New Revision: 1489663

URL: http://svn.apache.org/r1489663
Log:
Resolves CLIMATE-85 - Eval button doesn't display properly

- Changes the ng-hide and ng-disabled attributes of the evaluate button.
  The eval button is now hidden whenever there are less than 2 datasets
  and it is disabled when an evaluation is being run.

Modified:
    incubator/climate/trunk/rcmet/src/main/ui/app/index.html
    incubator/climate/trunk/rcmet/src/main/ui/app/js/controllers.js

Modified: incubator/climate/trunk/rcmet/src/main/ui/app/index.html
URL: 
http://svn.apache.org/viewvc/incubator/climate/trunk/rcmet/src/main/ui/app/index.html?rev=1489663&r1=1489662&r2=1489663&view=diff
==============================================================================
--- incubator/climate/trunk/rcmet/src/main/ui/app/index.html (original)
+++ incubator/climate/trunk/rcmet/src/main/ui/app/index.html Tue Jun  4 
22:54:06 2013
@@ -102,7 +102,7 @@
         <button ng-click="clearDatasets()" 
ng-hide="shouldDisableClearButton()" class="btn btn-block 
btn-warning">Clear</button>
       </div>
       <div class="span1">
-        <button ng-click="runEvaluation()" ng-hide="shouldDisableEvaluate()" 
class="btn btn-block btn-primary">
+        <button ng-click="runEvaluation()" ng-hide="shouldDisableControls()" 
ng-disabled="runningEval" class="btn btn-block btn-primary">
           <div ng-hide="runningEval">Evaluate</div>
           <div ng-show="runningEval"><i class="icon-spinner 
icon-spin"></i></div>
         </button>

Modified: incubator/climate/trunk/rcmet/src/main/ui/app/js/controllers.js
URL: 
http://svn.apache.org/viewvc/incubator/climate/trunk/rcmet/src/main/ui/app/js/controllers.js?rev=1489663&r1=1489662&r2=1489663&view=diff
==============================================================================
--- incubator/climate/trunk/rcmet/src/main/ui/app/js/controllers.js (original)
+++ incubator/climate/trunk/rcmet/src/main/ui/app/js/controllers.js Tue Jun  4 
22:54:06 2013
@@ -140,10 +140,6 @@ function ParameterSelectCtrl($rootScope,
                return (selectedDatasetInformation.getDatasetCount() < 2);
        }
 
-       $scope.shouldDisableEvaluate = function() {
-               return ($scope.shouldDisableControls() || $scope.runningEval);
-       }
-
        $scope.shouldDisableClearButton = function() {
                return (selectedDatasetInformation.getDatasetCount() == 0);
        }