Skip to content

Commit e11ffb9

Browse files
Paul LeclercqPaul Leclercq
Paul Leclercq
authored and
Paul Leclercq
committed
merge, bower install
2 parents 41f3fa2 + 62329cc commit e11ffb9

File tree

15 files changed

+39
-22
lines changed

15 files changed

+39
-22
lines changed

‎bower.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"author": "Siddique Hameed",
33
"name": "angular-timer",
4-
"version": "1.2.0",
4+
"version": "1.2.1",
55
"homepage": "https://github.com/siddii/angular-timer",
66
"description": "Angular-Timer : A simple AngularJS directive demonstrating re-usability & interoperability",
77
"repository": {

‎bower_components/angular-mocks/.bower.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
{
22
"name": "angular-mocks",
3-
"version": "1.3.13",
3+
"version": "1.3.14",
44
"main": "./angular-mocks.js",
55
"ignore": [],
66
"dependencies": {
7-
"angular": "1.3.13"
7+
"angular": "1.3.14"
88
},
99
"homepage": "https://github.com/angular/bower-angular-mocks",
10-
"_release": "1.3.13",
10+
"_release": "1.3.14",
1111
"_resolution": {
1212
"type": "version",
13-
"tag": "v1.3.13",
14-
"commit": "8f53bfda01696e53549fe3266b0a4d220ea9bf77"
13+
"tag": "v1.3.14",
14+
"commit": "b33962810730adca9a0f7165ecd4835b6bf40abb"
1515
},
1616
"_source": "git://github.com/angular/bower-angular-mocks.git",
1717
"_target": ">= 1.0.7",

‎bower_components/angular-mocks/README.md

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,16 @@ You can install this package either with `npm` or with `bower`.
1414
npm install angular-mocks
1515
```
1616

17-
The mocks are then available at `node_modules/angular-mocks/angular-mocks.js`.
18-
19-
Note that this package is not in CommonJS format, so doing `require('angular-mocks')` will
20-
return `undefined`.
17+
You can `require` ngMock modules:
18+
19+
```js
20+
var angular = require('angular');
21+
angular.module('myMod', [
22+
require('angular-animate'),
23+
require('angular-mocks/ngMock')
24+
require('angular-mocks/ngAnimateMock')
25+
]);
26+
```
2127

2228
### bower
2329

@@ -36,7 +42,7 @@ Documentation is available on the
3642

3743
The MIT License
3844

39-
Copyright (c) 2010-2012 Google, Inc. http://angularjs.org
45+
Copyright (c) 2010-2015 Google, Inc. http://angularjs.org
4046

4147
Permission is hereby granted, free of charge, to any person obtaining a copy
4248
of this software and associated documentation files (the "Software"), to deal

‎bower_components/angular-mocks/angular-mocks.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* @license AngularJS v1.3.13
2+
* @license AngularJS v1.3.14
33
* (c) 2010-2014 Google, Inc. http://angularjs.org
44
* License: MIT
55
*/

‎bower_components/angular-mocks/bower.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
22
"name": "angular-mocks",
3-
"version": "1.3.13",
3+
"version": "1.3.14",
44
"main": "./angular-mocks.js",
55
"ignore": [],
66
"dependencies": {
7-
"angular": "1.3.13"
7+
"angular": "1.3.14"
88
}
99
}

‎bower_components/angular-mocks/ngAnimateMock.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
require('./angular-mocks');
2+
module.exports = 'ngAnimateMock';

‎bower_components/angular-mocks/ngMock.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
require('./angular-mocks');
2+
module.exports = 'ngMock';

‎bower_components/angular-mocks/ngMockE2E.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
require('./angular-mocks');
2+
module.exports = 'ngMockE2E';

‎bower_components/angular-mocks/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "angular-mocks",
3-
"version": "1.3.13",
3+
"version": "1.3.14",
44
"description": "AngularJS mocks for testing",
55
"main": "angular-mocks.js",
66
"scripts": {

‎bower_components/humanize-duration/.bower.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,5 +54,6 @@
5454
},
5555
"_source": "git://github.com/EvanHahn/HumanizeDuration.js.git",
5656
"_target": "~2.4.0",
57-
"_originalSource": "humanize-duration"
57+
"_originalSource": "humanize-duration",
58+
"_direct": true
5859
}

‎bower_components/momentjs/.bower.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
"commit": "8b35bc74c0e88c1a8c58ccb90117a9edc9f6a479"
2626
},
2727
"_source": "git://github.com/moment/moment.git",
28-
"_target": "~2.9.0",
29-
"_originalSource": "momentjs"
28+
"_target": "~2.9.0",
29+
"_originalSource": "momentjs",
30+
"_direct": true
3031
}

‎dist/angular-timer.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* angular-timer - v1.2.0 - 2015-03-02 1:28 PM
2+
* angular-timer - v1.2.1 - 2015-03-02 1:54 PM
33
* https://github.com/siddii/angular-timer
44
*
55
* Copyright (c) 2015 Siddique Hameed
@@ -326,7 +326,7 @@ app.factory('I18nService', function() {
326326
I18nService.prototype.init = function init(lang){
327327
this.language = lang;
328328
//moment init
329-
moment.locale(this.language);
329+
moment.locale(this.language); //@TODO maybe to remove, it should be handle by the user's application itself, and not inside the directive
330330

331331
//human duration init, using it because momentjs does not allow accurate time (
332332
// momentJS: a few moment ago, human duration : 4 seconds ago

‎dist/angular-timer.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎navbar.html

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@
1919
<a href="index.html#basic-timer">Basic Example</a></li>
2020
<li>
2121
<a href="index.html#clock-timer">Clock Timer</a></li>
22+
<li>
23+
<li>
24+
<a href="index.html#clock-timer-i18n">Clock Timer with i18n</a></li>
2225
<li>
2326
<a href="index.html#timer-with-start-time">Timer with start time</a></li>
2427
<li>

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"author": "Siddique Hameed",
33
"name": "angular-timer",
4-
"version": "1.2.0",
4+
"version": "1.2.1",
55
"homepage": "https://github.com/siddii/angular-timer",
66
"main":"dist/angular-timer.js",
77
"licenses": {

0 commit comments

Comments
 (0)