Permalink
Browse files

upgrade to AnuglarJS 0.10.6 bubblewrap-cape

  • Loading branch information...
mhevery committed Jan 14, 2012
1 parent 2682dab commit 02e4c215ebfb9d5a31a88e13928ac7d84d0c5a69
View
@@ -5,3 +5,4 @@ build.xml
.project
.settings
+.idea/*
View
@@ -0,0 +1,53 @@
+<!doctype html>
+<html xmlns:ng="http://angularjs.org/" ng:app="myApp">

This comment has been minimized.

Show comment Hide comment
@marcenuc

marcenuc Jan 21, 2012

Contributor

Is "ng:app" needed? You call angular.bootstrap() later on this page.

@marcenuc

marcenuc Jan 21, 2012

Contributor

Is "ng:app" needed? You call angular.bootstrap() later on this page.

This comment has been minimized.

Show comment Hide comment
@vojtajina

vojtajina Jan 22, 2012

Contributor

You are right, ng:app should not be here.

@vojtajina

vojtajina Jan 22, 2012

Contributor

You are right, ng:app should not be here.

This comment has been minimized.

Show comment Hide comment
@IgorMinar

IgorMinar Jan 24, 2012

Member

+1

This comment has been minimized.

Show comment Hide comment
@IgorMinar

IgorMinar Jan 24, 2012

Member

I pushed an fix for this into repo

@IgorMinar

IgorMinar Jan 24, 2012

Member

I pushed an fix for this into repo

+<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>
View
@@ -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>

This comment has been minimized.

Show comment Hide comment
@marcenuc

marcenuc Jan 31, 2012

Contributor

Isn't ng:autobind superseded by ng:app?

@marcenuc

marcenuc Jan 31, 2012

Contributor

Isn't ng:autobind superseded by ng:app?

This comment has been minimized.

Show comment Hide comment
@mhevery

mhevery Jan 31, 2012

Member
@mhevery

mhevery via email Jan 31, 2012

Member

This comment has been minimized.

Show comment Hide comment
@vojtajina

vojtajina Jan 31, 2012

Contributor

Yes, that's just leftover - should not be there (it has no effect at all).

@vojtajina

vojtajina Jan 31, 2012

Contributor

Yes, that's just leftover - should not be there (it has no effect at all).

+ <script src="js/app.js"></script>
<script src="js/services.js"></script>
<script src="js/controllers.js"></script>
<script src="js/filters.js"></script>
View
@@ -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);
+ });
+ }]);
View
@@ -1,3 +1,4 @@
+'use strict';
/* App Controllers */
View
@@ -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);
+ }
+ }]);
View
@@ -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');
View
@@ -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);
+ }];
+ });
+});
@@ -1,35 +0,0 @@
-/*
-Content-Type: multipart/related; boundary="_"
-
---_
-Content-Location:img0
-Content-Transfer-Encoding:base64
-
-R0lGODlhCwAXAKIAAMzMzO/v7/f39////////wAAAAAAAAAAACH5BAUUAAQALAAAAAALABcAAAMrSLoc/AG8FeUUIN+sGebWAnbKSJodqqlsOxJtqYooU9vvk+vcJIcTkg+QAAA7
---_
-Content-Location:img1
-Content-Transfer-Encoding:base64
-
-R0lGODlhCwAXAKIAAMzMzO/v7/f39////////wAAAAAAAAAAACH5BAUUAAQALAAAAAALABcAAAMrCLTcoM29yN6k9socs91e5X3EyJloipYrO4ohTMqA0Fn2XVNswJe+H+SXAAA7
---_
-Content-Location:img2
-Content-Transfer-Encoding:base64
-
-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
---_--
-*/
-(function(){
- var jsUri = document.location.href.replace(/\/[^\/]+(#.*)?$/, '/') +
- document.getElementById('ng-ie-compat').src,
- css = '#ng-callout .ng-arrow-left{*background-image:url("mhtml:' + jsUri + '!img0")}#ng-callout .ng-arrow-right{*background-image:url("mhtml:' + jsUri + '!img1")}.ng-input-indicator-wait {*background-image:url("mhtml:' + jsUri + '!img2")}',
- s = document.createElement('style');
-
- s.setAttribute('type', 'text/css');
-
- if (s.styleSheet) {
- s.styleSheet.cssText = css;
- } else {
- s.appendChild(document.createTextNode(css));
- }
- document.getElementsByTagName('head')[0].appendChild(s);
-})();
Oops, something went wrong.

0 comments on commit 02e4c21

Please sign in to comment.