Skip to content
This repository was archived by the owner on Mar 22, 2026. It is now read-only.
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 16 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,10 @@ reverse-proxying the backend server(s) and a webserver(s).
### Running unit tests

We recommend using [jasmine](http://pivotal.github.com/jasmine/) and
[Testacular](http://vojtajina.github.com/testacular/) for your unit tests/specs, but you are free
[Karma](http://karma-runner.github.io/0.8/index.html) for your unit tests/specs, but you are free
to use whatever works for you.

Requires [node.js](http://nodejs.org/), Testacular (`sudo npm install -g testacular`) and a local
Requires [node.js](http://nodejs.org/), Karma (`sudo npm install -g karma`) and a local
or remote browser.

* start `scripts/test.sh` (on windows: `scripts\test.bat`)
Expand All @@ -79,7 +79,7 @@ info.
* serve your project directory with your http/backend server or node.js + `scripts/web-server.js`
* to run do one of:
* open `http://localhost:port/test/e2e/runner.html` in your browser
* run the tests from console with [Testacular](vojtajina.github.com/testacular) via
* run the tests from console with [Karma](http://karma-runner.github.io/0.8/index.html) via
`scripts/e2e-test.sh` or `script/e2e-test.bat`

### Continuous Integration
Expand Down Expand Up @@ -113,16 +113,26 @@ fetch the changes and merge them into your project with git.
services.js --> custom angular services
lib/ --> angular and 3rd party javascript libraries
angular/
angular-cookies.js
angular-cookies.min.js
angular-loader.js
angular-loader.min.js
angular-resource.js
angular-resource.min.js
angular-sanitize.js
angular-sanitize.min.js
angular.js --> the latest angular js
angular.min.js --> the latest minified angular js
angular-*.js --> angular add-on modules
version.txt --> version number
partials/ --> angular view partials (partial html templates)
partial1.html
partial2.html

config/testacular.conf.js --> config file for running unit tests with Testacular
config/testacular-e2e.conf.js --> config file for running e2e tests with Testacular

app.yaml

config/karma.conf.js --> config file for running unit tests with Testacular
config/karma-e2e.conf.js --> config file for running e2e tests with Testacular

scripts/ --> handy shell/js/ruby scripts
e2e-test.sh --> runs end-to-end tests with Testacular (*nix)
Expand Down
6 changes: 4 additions & 2 deletions app/lib/angular/angular-cookies.js
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* @license AngularJS v1.0.5
* @license AngularJS v1.0.7
* (c) 2010-2012 Google, Inc. http://angularjs.org
* License: MIT
*/
Expand Down Expand Up @@ -145,7 +145,8 @@ angular.module('ngCookies', ['ng']).
* @returns {Object} Deserialized cookie value.
*/
get: function(key) {
return angular.fromJson($cookies[key]);
var value = $cookies[key];
return value ? angular.fromJson(value) : value;
},

/**
Expand Down Expand Up @@ -180,4 +181,5 @@ angular.module('ngCookies', ['ng']).

}]);


})(window, window.angular);
6 changes: 3 additions & 3 deletions app/lib/angular/angular-cookies.min.js
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
AngularJS v1.0.5
AngularJS v1.0.7
(c) 2010-2012 Google, Inc. http://angularjs.org
License: MIT
*/
(function(m,f,l){'use strict';f.module("ngCookies",["ng"]).factory("$cookies",["$rootScope","$browser",function(d,c){var b={},g={},h,i=!1,j=f.copy,k=f.isUndefined;c.addPollFn(function(){var a=c.cookies();h!=a&&(h=a,j(a,g),j(a,b),i&&d.$apply())})();i=!0;d.$watch(function(){var a,e,d;for(a in g)k(b[a])&&c.cookies(a,l);for(a in b)e=b[a],f.isString(e)?e!==g[a]&&(c.cookies(a,e),d=!0):f.isDefined(g[a])?b[a]=g[a]:delete b[a];if(d)for(a in e=c.cookies(),b)b[a]!==e[a]&&(k(e[a])?delete b[a]:b[a]=e[a])});return b}]).factory("$cookieStore",
["$cookies",function(d){return{get:function(c){return f.fromJson(d[c])},put:function(c,b){d[c]=f.toJson(b)},remove:function(c){delete d[c]}}}])})(window,window.angular);
(function(m,f,l){'use strict';f.module("ngCookies",["ng"]).factory("$cookies",["$rootScope","$browser",function(d,b){var c={},g={},h,i=!1,j=f.copy,k=f.isUndefined;b.addPollFn(function(){var a=b.cookies();h!=a&&(h=a,j(a,g),j(a,c),i&&d.$apply())})();i=!0;d.$watch(function(){var a,e,d;for(a in g)k(c[a])&&b.cookies(a,l);for(a in c)e=c[a],f.isString(e)?e!==g[a]&&(b.cookies(a,e),d=!0):f.isDefined(g[a])?c[a]=g[a]:delete c[a];if(d)for(a in e=b.cookies(),c)c[a]!==e[a]&&(k(e[a])?delete c[a]:c[a]=e[a])});return c}]).factory("$cookieStore",
["$cookies",function(d){return{get:function(b){return(b=d[b])?f.fromJson(b):b},put:function(b,c){d[b]=f.toJson(c)},remove:function(b){delete d[b]}}}])})(window,window.angular);
3 changes: 2 additions & 1 deletion app/lib/angular/angular-loader.js
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* @license AngularJS v1.0.5
* @license AngularJS v1.0.7
* (c) 2010-2012 Google, Inc. http://angularjs.org
* License: MIT
*/
Expand Down Expand Up @@ -254,6 +254,7 @@ function setupModuleLoader(window) {
});

}

)(window);

/**
Expand Down
2 changes: 1 addition & 1 deletion app/lib/angular/angular-loader.min.js
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
AngularJS v1.0.5
AngularJS v1.0.7
(c) 2010-2012 Google, Inc. http://angularjs.org
License: MIT
*/
Expand Down
16 changes: 14 additions & 2 deletions app/lib/angular/angular-resource.js
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* @license AngularJS v1.0.5
* @license AngularJS v1.0.7
* (c) 2010-2012 Google, Inc. http://angularjs.org
* License: MIT
*/
Expand All @@ -24,6 +24,17 @@
* The returned resource object has action methods which provide high-level behaviors without
* the need to interact with the low level {@link ng.$http $http} service.
*
* # Installation
* To use $resource make sure you have included the `angular-resource.js` that comes in Angular
* package. You can also find this file on Google CDN, bower as well as at
* {@link http://code.angularjs.org/ code.angularjs.org}.
*
* Finally load the module in your application:
*
* angular.module('app', ['ngResource']);
*
* and you are ready to get started!
*
* @param {string} url A parameterized URL template with parameters prefixed by `:` as in
* `/user/:username`. If you are using a URL with a port number (e.g.
* `http://example.com:8080/api`), you'll need to escape the colon character before the port
Expand Down Expand Up @@ -268,7 +279,7 @@ angular.module('ngResource', ['ng']).
replace(/%3A/gi, ':').
replace(/%24/g, '$').
replace(/%2C/gi, ',').
replace((pctEncodeSpaces ? null : /%20/g), '+');
replace(/%20/g, (pctEncodeSpaces ? '%20' : '+'));
}

function Route(template, defaults) {
Expand Down Expand Up @@ -442,4 +453,5 @@ angular.module('ngResource', ['ng']).
return ResourceFactory;
}]);


})(window, window.angular);
4 changes: 2 additions & 2 deletions app/lib/angular/angular-resource.min.js
100644 → 100755

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion app/lib/angular/angular-sanitize.js
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* @license AngularJS v1.0.5
* @license AngularJS v1.0.7
* (c) 2010-2012 Google, Inc. http://angularjs.org
* License: MIT
*/
Expand Down Expand Up @@ -422,6 +422,7 @@ angular.module('ngSanitize').directive('ngBindHtml', ['$sanitize', function($san
});
};
}]);

/**
* @ngdoc filter
* @name ngSanitize.filter:linky
Expand Down Expand Up @@ -532,4 +533,5 @@ angular.module('ngSanitize').filter('linky', function() {
};
});


})(window, window.angular);
2 changes: 1 addition & 1 deletion app/lib/angular/angular-sanitize.min.js
100644 → 100755

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading