You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@climate.apache.org by le...@apache.org on 2016/02/05 06:10:27 UTC

[1/2] climate git commit: CLIMATE-750 - Fix a string comparison that should be against a boolean.

Repository: climate
Updated Branches:
  refs/heads/master 6ae76c6ef -> 5a3d4d030


CLIMATE-750 - Fix a string comparison that should be against a boolean.


Project: http://git-wip-us.apache.org/repos/asf/climate/repo
Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/ba93aeb2
Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/ba93aeb2
Diff: http://git-wip-us.apache.org/repos/asf/climate/diff/ba93aeb2

Branch: refs/heads/master
Commit: ba93aeb2e625a438a31c47e70f880aeeab8089b5
Parents: bd5ab80
Author: Vinicius Silva <vi...@gmail.com>
Authored: Wed Feb 3 21:16:32 2016 -0200
Committer: Vinicius Silva <vi...@gmail.com>
Committed: Wed Feb 3 21:16:32 2016 -0200

----------------------------------------------------------------------
 ocw-ui/frontend/app/scripts/controllers/observationselect.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/climate/blob/ba93aeb2/ocw-ui/frontend/app/scripts/controllers/observationselect.js
----------------------------------------------------------------------
diff --git a/ocw-ui/frontend/app/scripts/controllers/observationselect.js b/ocw-ui/frontend/app/scripts/controllers/observationselect.js
index 39d66b4..8555f12 100644
--- a/ocw-ui/frontend/app/scripts/controllers/observationselect.js
+++ b/ocw-ui/frontend/app/scripts/controllers/observationselect.js
@@ -184,8 +184,8 @@ angular.module('ocwUiApp')
         newDataset['time'] = $scope.timeSelect;
         newDataset['timeVals'] = {'start': $scope.timeVals[0], 'end': $scope.timeVals[1]};
 
-        //Check if the file loading filaed.
-        if($scope.fileLoadFailed === 'false'){
+        // Check if the file loading failed.
+        if($scope.fileLoadFailed === false){
           selectedDatasetInformation.addDataset(newDataset);  
           
           // Reset all the fields!!


[2/2] climate git commit: Merge branch 'CLIMATE-750' of https://github.com/veduardo/climate this closes #307

Posted by le...@apache.org.
Merge branch 'CLIMATE-750' of https://github.com/veduardo/climate this closes #307


Project: http://git-wip-us.apache.org/repos/asf/climate/repo
Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/5a3d4d03
Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/5a3d4d03
Diff: http://git-wip-us.apache.org/repos/asf/climate/diff/5a3d4d03

Branch: refs/heads/master
Commit: 5a3d4d030b38f8e6d3a52bb591b14cc0a3b65314
Parents: 6ae76c6 ba93aeb
Author: Lewis John McGibbney <le...@jpl.nasa.gov>
Authored: Thu Feb 4 21:13:33 2016 -0800
Committer: Lewis John McGibbney <le...@jpl.nasa.gov>
Committed: Thu Feb 4 21:13:33 2016 -0800

----------------------------------------------------------------------
 ocw-ui/frontend/app/scripts/controllers/observationselect.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------