Skip to content

Commit 37d1d74

Browse files
siddiisiddii
committed
* adding project's node_modules
* Updates to grunt file settings
1 parent dd645ff commit 37d1d74

163 files changed

Lines changed: 13354 additions & 30 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.gitignore‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,5 @@ logs/*
22
!.gitkeep
33
.idea
44
*.iml
5-
node_modules/
65
build/
76
.DS_Store

‎app/js/timer.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,9 +73,9 @@ angular.module('timer', [])
7373

7474
//determine initial values of time units
7575
if ($scope.countdownattr) {
76-
$scope.millis = $scope.countdownattr * 1000
76+
$scope.millis = $scope.countdownattr * 1000;
7777
} else {
78-
$scope.millis = 0
78+
$scope.millis = 0;
7979
}
8080
calculateTimeUnits();
8181

@@ -106,7 +106,7 @@ angular.module('timer', [])
106106
$scope.$emit('timer-tick', {timeoutId: $scope.timeoutId, millis: $scope.millis});
107107
};
108108

109-
if ($scope.autoStart == undefined || $scope.autoStart == true) {
109+
if ($scope.autoStart === undefined || $scope.autoStart === true) {
110110
$scope.start();
111111
}
112112
}

‎bower.json‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,5 @@
1111
"dependencies": {
1212
"angular": ">= 1.0.7"
1313
},
14-
"main": "./release/angular-timer.min.js",
15-
"devDependencies": {
16-
"angular-timer": "1.0.1"
17-
}
14+
"main": "./release/angular-timer.min.js"
1815
}

‎examples.html‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,10 @@
3232
}
3333
</style>
3434
<script src="jquery/jquery-1.9.1.min.js"></script>
35-
<script src="bootstrap/js/bootstrap.min.js"></script>
3635
<script src="angular/angular.min.js"></script>
36+
<script src="bootstrap/js/bootstrap.min.js"></script>
3737
<script src="release/angular-timer.min.js"></script>
3838

39-
4039
<script>
4140
function startTimer(sectionId) {
4241
document.getElementById(sectionId).getElementsByTagName('timer')[0].start();

‎index.html‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,10 @@
3030
}
3131
</style>
3232
<script src="jquery/jquery-1.9.1.min.js"></script>
33-
<script src="bootstrap/js/bootstrap.min.js"></script>
3433
<script src="angular/angular.min.js"></script>
35-
<script src="app/js/timer.js"></script>
34+
<script src="bootstrap/js/bootstrap.min.js"></script>
35+
<script src="release/angular-timer.min.js"></script>
36+
3637
<script>
3738
function startTimer(sectionId) {
3839
document.getElementById(sectionId).getElementsByTagName('timer')[0].start();

‎node_modules/.bin/grunt‎

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

‎node_modules/.bin/karma‎

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

‎node_modules/grunt/.npmignore‎

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎node_modules/grunt/.travis.yml‎

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎node_modules/grunt/AUTHORS‎

Lines changed: 4 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)