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

[jo...@apache.org]

Author: joyce
Date: Wed Jun 12 23:16:45 2013
New Revision: 1492473

URL: http://svn.apache.org/r1492473
Log:
Resolves CLIMATE-95 - Break up controllers.js

- Finishes moving controllers from controller.js to new files in
  js/controllers/*.
- Removes controllers.js
- Makes SettingsCtrl.js

Added:
    incubator/climate/trunk/rcmet/src/main/ui/app/js/controllers/SettingsCtrl.js   (with props)
Removed:
    incubator/climate/trunk/rcmet/src/main/ui/app/js/controllers.js
Modified:
    incubator/climate/trunk/rcmet/src/main/ui/app/index.html

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=1492473&r1=1492472&r2=1492473&view=diff
==============================================================================
--- incubator/climate/trunk/rcmet/src/main/ui/app/index.html (original)
+++ incubator/climate/trunk/rcmet/src/main/ui/app/index.html Wed Jun 12 23:16:45 2013
@@ -229,12 +229,12 @@
   <script src="http://cdn.leafletjs.com/leaflet-0.5/leaflet.js"></script>
   <script src="js/app.js"></script>
   <script src="js/services.js"></script>
-  <script src="js/controllers.js"></script>
   <script src="js/controllers/WorldMapCtrl.js"></script>
   <script src="js/controllers/ParameterSelectCtrl.js"></script>
   <script src="js/controllers/DatasetDisplayCtrl.js"></script>
   <script src="js/controllers/ObservationSelectCtrl.js"></script>
   <script src="js/controllers/RcmedSelectionCtrl.js"></script>
+  <script src="js/controllers/SettingsCtrl.js"></script>
   <script src="js/filters.js"></script>
   <script src="js/directives.js"></script>
 </body>

Added: incubator/climate/trunk/rcmet/src/main/ui/app/js/controllers/SettingsCtrl.js
URL: http://svn.apache.org/viewvc/incubator/climate/trunk/rcmet/src/main/ui/app/js/controllers/SettingsCtrl.js?rev=1492473&view=auto
==============================================================================
--- incubator/climate/trunk/rcmet/src/main/ui/app/js/controllers/SettingsCtrl.js (added)
+++ incubator/climate/trunk/rcmet/src/main/ui/app/js/controllers/SettingsCtrl.js Wed Jun 12 23:16:45 2013
@@ -0,0 +1,20 @@
+//
+// Licensed to the Apache Software Foundation (ASF) under one or more
+// contributor license agreements.See the NOTICE file distributed with
+// this work for additional information regarding copyright ownership.
+// The ASF licenses this file to You under the Apache License, Version 2.0
+// (the "License"); you may not use this file except in compliance with
+// the License.You may obtain a copy of the License at
+// 
+// http://www.apache.org/licenses/LICENSE-2.0
+// 
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+function SettingsCtrl($scope, evaluationSettings) {
+	$scope.settings = evaluationSettings.getSettings();
+}

Propchange: incubator/climate/trunk/rcmet/src/main/ui/app/js/controllers/SettingsCtrl.js
------------------------------------------------------------------------------
    svn:executable = *