upgrade to AnuglarJS 0.10.6 bubblewrap-cape

StarterSquad · Jan 14, 2012 · 02e4c21 · 02e4c21
1 parent 2682dab
commit 02e4c21
Show file tree

Hide file tree

Showing 27 changed files with 28,535 additions and 20,398 deletions.
diff --git a/.gitignore b/.gitignore
@@ -5,3 +5,4 @@ build.xml
 
 .project
 .settings
+.idea/*
diff --git a/app/index-async.html b/app/index-async.html
@@ -0,0 +1,53 @@
+<!doctype html>
+<html xmlns:ng="http://angularjs.org/" ng:app="myApp">
+<head>
+  <meta charset="utf-8">
+  <script>
+    // include angular loader, which allows the files to load in any order
+    /*
+     AngularJS v0.10.6-5cdfe45a
+     (c) 2010-2012 AngularJS http://angularjs.org
+     License: MIT
+    */
+    'use strict';(function(i){function d(a,b,c){return a[b]||(a[b]=c())}return d(d(i,"angular",Object),"module",function(){var a={};return function(b,c,e){c&&a.hasOwnProperty(b)&&(a[b]=null);return d(a,b,function(){function a(b,c){return function(){d.push([b,c,arguments]);return f}}if(!c)throw Error("No module: "+b);var d=[],g=[],h=a("$injector","invoke"),f={_invokeQueue:d,_runBlocks:g,requires:c,name:b,service:a("$provide","service"),factory:a("$provide","factory"),value:a("$provide","value"),filter:a("$filterProvider",
+    "register"),config:h,run:function(a){g.push(a);return this}};e&&h(e);return f})}})})(window);
+
+    // include a third-party async loader library
+    /*!
+     * $script.js v1.3
+     * https://github.com/ded/script.js
+     * Copyright: @ded & @fat - Dustin Diaz, Jacob Thornton 2011
+     * Follow our software http://twitter.com/dedfat
+     * License: MIT
+     */
+    !function(a,b,c){function t(a,c){var e=b.createElement("script"),f=j;e.onload=e.onerror=e[o]=function(){e[m]&&!/^c|loade/.test(e[m])||f||(e.onload=e[o]=null,f=1,c())},e.async=1,e.src=a,d.insertBefore(e,d.firstChild)}function q(a,b){p(a,function(a){return!b(a)})}var d=b.getElementsByTagName("head")[0],e={},f={},g={},h={},i="string",j=!1,k="push",l="DOMContentLoaded",m="readyState",n="addEventListener",o="onreadystatechange",p=function(a,b){for(var c=0,d=a.length;c<d;++c)if(!b(a[c]))return j;return 1};!b[m]&&b[n]&&(b[n](l,function r(){b.removeEventListener(l,r,j),b[m]="complete"},j),b[m]="loading");var s=function(a,b,d){function o(){if(!--m){e[l]=1,j&&j();for(var a in g)p(a.split("|"),n)&&!q(g[a],n)&&(g[a]=[])}}function n(a){return a.call?a():e[a]}a=a[k]?a:[a];var i=b&&b.call,j=i?b:d,l=i?a.join(""):b,m=a.length;c(function(){q(a,function(a){h[a]?(l&&(f[l]=1),o()):(h[a]=1,l&&(f[l]=1),t(s.path?s.path+a+".js":a,o))})},0);return s};s.get=t,s.ready=function(a,b,c){a=a[k]?a:[a];var d=[];!q(a,function(a){e[a]||d[k](a)})&&p(a,function(a){return e[a]})?b():!function(a){g[a]=g[a]||[],g[a][k](b),c&&c(d)}(a.join("|"));return s};var u=a.$script;s.noConflict=function(){a.$script=u;return this},typeof module!="undefined"&&module.exports?module.exports=s:a.$script=s}(this,document,setTimeout)
+
+    // load all of the dependencies asynchronously.
+    $script([
+      'lib/angular/angular.js',
+      'js/app.js',
+      'js/services.js',
+      'js/controllers.js',
+      'js/filters.js',
+      'js/widgets.js'
+    ], function() {
+      // when all is done, execute bootstrap angular application
+      angular.bootstrap(document, ['myApp']);
+    });
+  </script>
+  <title>my angular app</title>
+  <link rel="stylesheet" href="css/app.css"/>
+</head>
+<body>
+  <ul class="menu">
+    <li><a href="#/view1">view1</a></li>
+    <li><a href="#/view2">view2</a></li>
+  </ul>
+
+  <ng:view></ng:view>
+
+  <div>Angular seed app: v<span app-version></span></div>
+
+</head>
+</body>
+</html>
diff --git a/app/index.html b/app/index.html
@@ -1,5 +1,5 @@
 <!doctype html>
-<html xmlns:ng="http://angularjs.org/">
+<html xmlns:ng="http://angularjs.org/" ng:app="myApp">
 <head>
   <meta charset="utf-8">
   <title>my angular app</title>
@@ -13,7 +13,10 @@
 
   <ng:view></ng:view>
 
+  <div>Angular seed app: v<span app-version></span></div>
+
   <script src="lib/angular/angular.js" ng:autobind></script>
+  <script src="js/app.js"></script>
   <script src="js/services.js"></script>
   <script src="js/controllers.js"></script>
   <script src="js/filters.js"></script>

diff --git a/app/js/app.js b/app/js/app.js
@@ -0,0 +1,17 @@
+'use strict';
+/* http://docs.angularjs.org/#!angular.service */
+
+// Declare app level module which depends on filters, and services
+angular.module('myApp', ['myApp.filters', 'myApp.services', 'myApp.widgets']).
+  run(['$route', '$window', '$rootScope', function($route, $window, $rootScope) {
+
+    $route.when('/view1', {template: 'partials/partial1.html', controller: MyCtrl1});
+    $route.when('/view2', {template: 'partials/partial2.html', controller: MyCtrl2});
+    $route.otherwise({redirectTo: '/view1'});
+
+    var self = this;
+
+    $rootScope.$on('$afterRouteChange', function(){
+      $window.scrollTo(0,0);
+    });
+  }]);
diff --git a/app/js/controllers.js b/app/js/controllers.js
@@ -1,3 +1,4 @@
+'use strict';
 /* App Controllers */
 
 

diff --git a/app/js/filters.js b/app/js/filters.js
@@ -1 +1,9 @@
+'use strict';
 /* http://docs.angularjs.org/#!angular.filter */
+
+angular.module('myApp.filters', []).
+  filter('interpolate', ['version', function(version) {
+    return function(text) {
+      return String(text).replace(/\%VERSION\%/mg, version);
+    }
+  }]);
diff --git a/app/js/services.js b/app/js/services.js
@@ -1,18 +1,7 @@
+'use strict';
 /* http://docs.angularjs.org/#!angular.service */
 
-/**
- * App service which is responsible for the main configuration of the app.
- */
-angular.service('myAngularApp', function($route, $window) {
-
-  $route.when('/view1', {template: 'partials/partial1.html', controller: MyCtrl1});
-  $route.when('/view2', {template: 'partials/partial2.html', controller: MyCtrl2});
-  $route.otherwise({redirectTo: '/view1'});
-
-  var self = this;
-
-  self.$on('$afterRouteChange', function(){
-    $window.scrollTo(0,0);
-  });
-
-}, {$inject:['$route', '$window'], $eager: true});
+// Demonstrate how to register services
+// In this case it is a simple constant service.
+angular.module('myApp.services', []).
+  value('version', '0.1');
diff --git a/app/js/widgets.js b/app/js/widgets.js
@@ -1 +1,11 @@
+'use strict';
 /* http://docs.angularjs.org/#!angular.widget */
+
+angular.module('myApp.widgets', [], function() {
+  // temporary hack until we have proper directive injection.
+  angular.directive('app-version', function() {
+    return ['version', '$element', function(version, element) {
+      element.text(version);
+    }];
+  });
+});
diff --git a/app/lib/angular/angular-ie-compat.js b/app/lib/angular/angular-ie-compat.js
Original file line number	Diff line number	Diff line change
		@@ -1,3 +1,4 @@
		'use strict';
		/* App Controllers */


Expand Down