Skip to content

Commit 5ebd73c

Browse files
siddiisiddii
committed
Merge pull request siddii#207 from siddii/fix-build
Fix tests
2 parents 125d3b1 + 8946726 commit 5ebd73c

12 files changed

+21
-34
lines changed

‎Gruntfile.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ module.exports = function (grunt) {
143143
testserver: {
144144
options: {
145145
port: 3030,
146-
base: 'dist'
146+
base: '.'
147147
}
148148
}
149149
},

‎dist/angular-timer.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* angular-timer - v1.3.3 - 2015-06-15 3:07 PM
2+
* angular-timer - v1.3.3 - 2015-08-17 4:25 PM
33
* https://github.com/siddii/angular-timer
44
*
55
* Copyright (c) 2015 Siddique Hameed

‎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.

‎dist/assets/js/angular-timer-all.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.

‎dist/examples/angularjs-add-countdown-seconds.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
<head>
44
<title>AngularJS Example - Single Timer Example</title>
55
<!-- compiled CSS -->
6-
<link rel="stylesheet" type="text/css" href="../assets/css/angular-timer-bower.css" />
6+
<link rel="stylesheet" type="text/css" href="../dist/assets/css/angular-timer-bower.css" />
77

88
<!-- compiled JavaScript -->
9-
<script type="text/javascript" src="../assets/js/angular-timer-bower.js"></script>
10-
<script type="text/javascript" src="../assets/js/angular-timer-all.min.js"></script>
9+
<script type="text/javascript" src="../dist/assets/js/angular-timer-bower.js"></script>
10+
<script type="text/javascript" src="../dist/assets/js/angular-timer-all.min.js"></script>
1111
<script>
1212
angular.module('MyApp', ['timer'])
1313
.controller('MyAppController', ['$scope', function ($scope) {

‎dist/examples/angularjs-multiple-timers.html

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,10 @@
22
<html>
33
<head>
44
<title>AngularJS Example - Multiple Timers Example</title>
5-
<!-- compiled CSS -->
6-
<link rel="stylesheet" type="text/css" href="../assets/css/angular-timer-bower.css" />
75

86
<!-- compiled JavaScript -->
9-
<script type="text/javascript" src="../assets/js/angular-timer-bower.js"></script>
10-
<script type="text/javascript" src="../assets/js/angular-timer-all.min.js"></script>
7+
<script type="text/javascript" src="../dist/assets/js/angular-timer-bower.js"></script>
8+
<script type="text/javascript" src="../dist/assets/js/angular-timer-all.min.js"></script>
119
<script>
1210
angular.module('MyApp', ['timer'])
1311
.controller('MyAppController', ['$scope', function ($scope) {

‎dist/examples/angularjs-polling-timer.html

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,10 @@
22
<html>
33
<head>
44
<title>AngularJS Example - Polling Timer Example</title>
5-
<!-- compiled CSS -->
6-
<link rel="stylesheet" type="text/css" href="../assets/css/angular-timer-bower.css" />
75

86
<!-- compiled JavaScript -->
9-
<script type="text/javascript" src="../assets/js/angular-timer-bower.js"></script>
10-
<script type="text/javascript" src="../assets/js/angular-timer-all.min.js"></script>
7+
<script type="text/javascript" src="../dist/assets/js/angular-timer-bower.js"></script>
8+
<script type="text/javascript" src="../dist/assets/js/angular-timer-all.min.js"></script>
119
<script>
1210
angular.module('MyApp', ['timer'])
1311
.controller('PollingController', ['$scope', '$timeout', function ($scope, $timeout) {

‎dist/examples/angularjs-single-timer.html

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,10 @@
22
<html>
33
<head>
44
<title>AngularJS Example - Single Timer Example</title>
5-
<!-- compiled CSS -->
6-
<link rel="stylesheet" type="text/css" href="../assets/css/angular-timer-bower.css" />
7-
5+
86
<!-- compiled JavaScript -->
9-
<script type="text/javascript" src="../assets/js/angular-timer-bower.js"></script>
10-
<script type="text/javascript" src="../assets/js/angular-timer-all.min.js"></script>
7+
<script type="text/javascript" src="../dist/assets/js/angular-timer-bower.js"></script>
8+
<script type="text/javascript" src="../dist/assets/js/angular-timer-all.min.js"></script>
119
<script>
1210
angular.module('MyApp', ['timer'])
1311
.controller('MyAppController', ['$scope', function ($scope) {

‎dist/examples/jquery-timer.html

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,9 @@
22
<html>
33
<head>
44
<title>JQuery Timer Example</title>
5-
<!-- compiled CSS -->
6-
<link rel="stylesheet" type="text/css" href="../assets/css/angular-timer-bower.css" />
7-
85
<!-- compiled JavaScript -->
9-
<script type="text/javascript" src="../assets/js/angular-timer-bower.js"></script>
10-
<script type="text/javascript" src="../assets/js/angular-timer-all.min.js"></script>
6+
<script type="text/javascript" src="../dist/assets/js/angular-timer-bower.js"></script>
7+
<script type="text/javascript" src="../dist/assets/js/angular-timer-all.min.js"></script>
118
<script>
129
function startTimer() {
1310
$('timer')[0].start();

‎dist/examples/plain-javascript.html

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,9 @@
22
<html>
33
<head>
44
<title>Plain Javascript Timer Example</title>
5-
<!-- compiled CSS -->
6-
<link rel="stylesheet" type="text/css" href="../assets/css/angular-timer-bower.css" />
7-
85
<!-- compiled JavaScript -->
9-
<script type="text/javascript" src="../assets/js/angular-timer-bower.js"></script>
10-
<script type="text/javascript" src="../assets/js/angular-timer-all.min.js"></script>
6+
<script type="text/javascript" src="../dist/assets/js/angular-timer-bower.js"></script>
7+
<script type="text/javascript" src="../dist/assets/js/angular-timer-all.min.js"></script>
118
<script>
129
function startTimer() {
1310
document.getElementsByTagName('timer')[0].start();

‎dist/examples/timer-with-autostart-false-and-starttime.html

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,10 @@
22
<html>
33
<head>
44
<title>Start Time and Auto Start set - Timer Example</title>
5-
<!-- compiled CSS -->
6-
<link rel="stylesheet" type="text/css" href="../assets/css/angular-timer-bower.css" />
75

86
<!-- compiled JavaScript -->
9-
<script type="text/javascript" src="../assets/js/angular-timer-bower.js"></script>
10-
<script type="text/javascript" src="../assets/js/angular-timer-all.min.js"></script>
7+
<script type="text/javascript" src="../dist/assets/js/angular-timer-bower.js"></script>
8+
<script type="text/javascript" src="../dist/assets/js/angular-timer-all.min.js"></script>
119
</head>
1210
<body ng-app="timer">
1311
<div id="start-time-and-auto-start-set">

‎package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
"version": "1.3.3",
55
"homepage": "https://github.com/siddii/angular-timer",
66
"main": "dist/angular-timer.js",
7+
"license": "MIT",
78
"licenses": {
89
"type": "MIT",
910
"url": "https://github.com/siddii/angular-timer/blob/master/LICENSE.txt"

0 commit comments

Comments
 (0)