merge with master repo

with conflicts

Author: rajexcited

app/js/timer.js

@@ -13,6 +13,14 @@ angular.module('timer', [])
       },
       controller: ['$scope', '$element', '$attrs', '$timeout', function ($scope, $element, $attrs, $timeout) {
 
+        // Checking for trim function since IE8 doesn't have it
+        // If not a function, create tirm with RegEx to mimic native trim
+        if(typeof String.prototype.trim !== 'function') {
+          String.prototype.trim = function() {
+            return this.replace(/^\s+|\s+$/g, '');
+          };
+        }
+
         //angular 1.2 doesn't support attributes ending in "-start", so we're
         //supporting both "autostart" and "auto-start" as a solution for
         //backward and forward compatibility.

bower.json

@@ -1,7 +1,7 @@
 {
   "author": "Siddique Hameed",
   "name": "angular-timer",
-  "version": "1.0.12",
+  "version": "1.1.0",
   "homepage": "https://github.com/siddii/angular-timer",
   "description": "Angular-Timer : A simple AngularJS directive demonstrating re-usability & interoperability",
   "repository": {

dist/README.md

@@ -1,5 +1,9 @@
 ##Change Log
 
+###Version 1.1.0
+* Plural/singular units. PR - https://github.com/siddii/angular-timer/pull/54
+* IE8 support. PR - https://github.com/siddii/angular-timer/pull/62
+
 ###Version 1.0.12
 * `clear` method. Please see this PR - https://github.com/siddii/angular-timer/pull/43
 

dist/angular-timer.js

@@ -168,13 +168,15 @@ <h3>Plural / Singular units</h3>
     <div class="bs-docs-example">
         <p>
             Two stopped countdown timers to illustrate how to handle pluralization of time units.
-            <code ng-non-bindable="">
+        <code ng-non-bindable="">
             &lt;timer autostart="false" countdown="90061"&gt;{{days}} day{{daysS}}, {{hours}} hour{{hoursS}}, {{minutes}} minute{{minutesS}}, {{seconds}} second{{secondsS}}.&lt;/timer&gt;
-            </code>
-
+        </code>
         <h3 class="singular-counter">
             <timer autostart="false" countdown="90061">{{days}} day{{daysS}}, {{hours}} hour{{hoursS}}, {{minutes}} minute{{minutesS}}, {{seconds}} second{{secondsS}}.</timer>
         </h3>
+        <code ng-non-bindable="">
+        &lt;timer autostart="false" countdown="190061"&gt;{{days}} day{{daysS}}, {{hours}} hour{{hoursS}}, {{minutes}} minute{{minutesS}}, {{seconds}} second{{secondsS}}.&lt;/timer&gt;
+        </code>
         <h3 class="plural-counter">
             <timer autostart="false" countdown="190061">{{days}} day{{daysS}}, {{hours}} hour{{hoursS}}, {{minutes}} minute{{minutesS}}, {{seconds}} second{{secondsS}}.</timer>
         </h3>

dist/angular-timer.min.js

@@ -1,7 +1,7 @@
 {
   "author": "Siddique Hameed",
   "name": "angular-timer",
-  "version": "1.0.12",
+  "version": "1.1.0",
   "homepage": "https://github.com/siddii/angular-timer",
   "licenses": {
     "type": "MIT",