climate-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jo...@apache.org
Subject svn commit: r1503775 - in /incubator/climate/trunk/rcmet/src/main/ui: app/index.html app/js/app.js config/karma.conf.js
Date Tue, 16 Jul 2013 16:11:24 GMT
Author: joyce
Date: Tue Jul 16 16:11:23 2013
New Revision: 1503775

URL: http://svn.apache.org/r1503775
Log:
CLIMATE-197 - Add Angular-UI

- Add imports in index.html for angular-ui.
- Switch angular.js import o use minified version.
- Add dependency injection in app.js for angular-ui.
- Include angular-ui in Karma config.

Modified:
    incubator/climate/trunk/rcmet/src/main/ui/app/index.html
    incubator/climate/trunk/rcmet/src/main/ui/app/js/app.js
    incubator/climate/trunk/rcmet/src/main/ui/config/karma.conf.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=1503775&r1=1503774&r2=1503775&view=diff
==============================================================================
--- incubator/climate/trunk/rcmet/src/main/ui/app/index.html (original)
+++ incubator/climate/trunk/rcmet/src/main/ui/app/index.html Tue Jul 16 16:11:23 2013
@@ -278,7 +278,8 @@
   <!--Libraries-->
   <script src="js/lib/jquery/jquery-1.10.1.js"></script>
   <script src="js/lib/jquery/jquery-ui/jquery-ui-1.10.3.min.js"></script>
-  <script src="js/lib/angular/angular.js"></script>
+  <script src="js/lib/angular/angular.min.js"></script>
+  <script src="js/lib/angular-ui/angular-ui-0.4-tpls.js"></script>
   <script src="js/lib/jquery/jquery-ui/datepicker-wrapper/date.js"></script>
   <script src="js/lib/bootstrap/bootstrap.js"></script>
   <script src="js/lib/leaflet/leaflet-0.5.js"></script>

Modified: incubator/climate/trunk/rcmet/src/main/ui/app/js/app.js
URL: http://svn.apache.org/viewvc/incubator/climate/trunk/rcmet/src/main/ui/app/js/app.js?rev=1503775&r1=1503774&r2=1503775&view=diff
==============================================================================
--- incubator/climate/trunk/rcmet/src/main/ui/app/js/app.js (original)
+++ incubator/climate/trunk/rcmet/src/main/ui/app/js/app.js Tue Jul 16 16:11:23 2013
@@ -28,7 +28,7 @@ App.Directives = angular.module('ocw.dir
 App.Controllers = angular.module('ocw.controllers', []);
 App.Filters = angular.module('ocw.filters', []);
 
-angular.module('ocw', ['ocw.services', 'ocw.directives', 'ocw.controllers', 'ocw.filters',
'ui.date']).
+angular.module('ocw', ['ocw.services', 'ocw.directives', 'ocw.controllers', 'ocw.filters',
'ui.date', 'ui.bootstrap']).
 	config(['$routeProvider', function($routeProvider) {
 		$routeProvider.
 			when('/obs', {templateUrl: 'partials/selectObservation.html', controller: 'ObservationSelectCtrl'}).

Modified: incubator/climate/trunk/rcmet/src/main/ui/config/karma.conf.js
URL: http://svn.apache.org/viewvc/incubator/climate/trunk/rcmet/src/main/ui/config/karma.conf.js?rev=1503775&r1=1503774&r2=1503775&view=diff
==============================================================================
--- incubator/climate/trunk/rcmet/src/main/ui/config/karma.conf.js (original)
+++ incubator/climate/trunk/rcmet/src/main/ui/config/karma.conf.js Tue Jul 16 16:11:23 2013
@@ -26,6 +26,7 @@ files = [
   'app/js/lib/bootstrap/bootstrap.js',
   'app/js/lib/angular/angular.js',
   'app/js/lib/angular/angular-*.js',
+  'app/js/lib/angular-ui/*.js',
   'test/lib/angular/angular-mocks.js',
   'app/js/lib/jquery/jquery-ui/datepicker-wrapper/date.js',
   'app/js/lib/leaflet/leaflet-0.5.js',



Mime
View raw message