Skip to content

Commit f1f1ee1

Browse files
committed
Revert "merge from siddii master"
This reverts commit 54b6788.
1 parent 54b6788 commit f1f1ee1

File tree

7 files changed

+8
-30
lines changed

7 files changed

+8
-30
lines changed

app/js/timer.js

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,6 @@ angular.module('timer', [])
1313
},
1414
controller: ['$scope', '$element', '$attrs', '$timeout', function ($scope, $element, $attrs, $timeout) {
1515

16-
// Checking for trim function since IE8 doesn't have it
17-
// If not a function, create tirm with RegEx to mimic native trim
18-
if(typeof String.prototype.trim !== 'function') {
19-
String.prototype.trim = function() {
20-
return this.replace(/^\s+|\s+$/g, '');
21-
};
22-
}
23-
2416
//angular 1.2 doesn't support attributes ending in "-start", so we're
2517
//supporting both "autostart" and "auto-start" as a solution for
2618
//backward and forward compatibility.

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.1.0",
4+
"version": "1.0.12",
55
"homepage": "https://github.com/siddii/angular-timer",
66
"description": "Angular-Timer : A simple AngularJS directive demonstrating re-usability & interoperability",
77
"repository": {

dist/README.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
##Change Log
22

3-
###Version 1.1.0
4-
* Plural/singular units. PR - https://github.com/siddii/angular-timer/pull/54
5-
* IE8 support. PR - https://github.com/siddii/angular-timer/pull/62
6-
73
###Version 1.0.12
84
* `clear` method. Please see this PR - https://github.com/siddii/angular-timer/pull/43
95

dist/angular-timer.js

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* angular-timer - v1.1.0 - 2014-04-20 7:46 PM
2+
* angular-timer - v1.0.12 - 2014-04-20 7:17 PM
33
* https://github.com/siddii/angular-timer
44
*
55
* Copyright (c) 2014 Siddique Hameed
@@ -20,14 +20,6 @@ angular.module('timer', [])
2020
},
2121
controller: ['$scope', '$element', '$attrs', '$timeout', function ($scope, $element, $attrs, $timeout) {
2222

23-
// Checking for trim function since IE8 doesn't have it
24-
// If not a function, create tirm with RegEx to mimic native trim
25-
if(typeof String.prototype.trim !== 'function') {
26-
String.prototype.trim = function() {
27-
return this.replace(/^\s+|\s+$/g, '');
28-
};
29-
}
30-
3123
//angular 1.2 doesn't support attributes ending in "-start", so we're
3224
//supporting both "autostart" and "auto-start" as a solution for
3325
//backward and forward compatibility.

dist/angular-timer.min.js

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

index.html

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -168,15 +168,13 @@ <h3>Plural / Singular units</h3>
168168
<div class="bs-docs-example">
169169
<p>
170170
Two stopped countdown timers to illustrate how to handle pluralization of time units.
171-
<code ng-non-bindable="">
171+
<code ng-non-bindable="">
172172
&lt;timer autostart="false" countdown="90061"&gt;{{days}} day{{daysS}}, {{hours}} hour{{hoursS}}, {{minutes}} minute{{minutesS}}, {{seconds}} second{{secondsS}}.&lt;/timer&gt;
173-
</code>
173+
</code>
174+
174175
<h3 class="singular-counter">
175176
<timer autostart="false" countdown="90061">{{days}} day{{daysS}}, {{hours}} hour{{hoursS}}, {{minutes}} minute{{minutesS}}, {{seconds}} second{{secondsS}}.</timer>
176177
</h3>
177-
<code ng-non-bindable="">
178-
&lt;timer autostart="false" countdown="190061"&gt;{{days}} day{{daysS}}, {{hours}} hour{{hoursS}}, {{minutes}} minute{{minutesS}}, {{seconds}} second{{secondsS}}.&lt;/timer&gt;
179-
</code>
180178
<h3 class="plural-counter">
181179
<timer autostart="false" countdown="190061">{{days}} day{{daysS}}, {{hours}} hour{{hoursS}}, {{minutes}} minute{{minutesS}}, {{seconds}} second{{secondsS}}.</timer>
182180
</h3>

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.1.0",
4+
"version": "1.0.12",
55
"homepage": "https://github.com/siddii/angular-timer",
66
"licenses": {
77
"type": "MIT",

0 commit comments

Comments
 (0)