From 363925074d413b63e07246a75da73748253cacab Mon Sep 17 00:00:00 2001 From: Deepu KS Date: Thu, 27 Aug 2015 11:45:10 +0800 Subject: [PATCH] 0.5.0 --- bower.json | 2 +- dist/angular-clock.js | 72 ++++++++++++++++++++++------------ dist/angular-clock.js.tar.gz | Bin 5808 -> 6111 bytes dist/angular-clock.min.js | 2 +- dist/angular-clock.min.js.map | 2 +- examples/app.js | 8 +++- examples/index.html | 32 ++++++++++----- examples/index.template.html | 30 +++++++++----- package.json | 2 +- 9 files changed, 99 insertions(+), 51 deletions(-) diff --git a/bower.json b/bower.json index 10040c1..a977cc0 100644 --- a/bower.json +++ b/bower.json @@ -1,6 +1,6 @@ { "name": "angular-ui-clock", - "version": "0.4.0", + "version": "0.5.0", "main": [ "./dist/angular-clock.js", "./dist/angular-clock.css" diff --git a/dist/angular-clock.js b/dist/angular-clock.js index da78e62..390edfd 100644 --- a/dist/angular-clock.js +++ b/dist/angular-clock.js @@ -1,7 +1,10 @@ (function() { 'use strict'; - /* */ + /** + * Usage pattern + * + */ var days = ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday']; var months = ['January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December']; @@ -17,23 +20,24 @@ restrict: 'EA', scope: { gmtOffset: '=gmtOffset', - digitalFormat: '=digitalFormat' + digitalFormat: '=digitalFormat', + showDigital: '=showDigital', + showAnalog: '=showAnalog', + startTime: '=startTime', + theme: '=theme' }, - template: '
{{digital}}
{{gmtInfo}}
', + template: '
{{digital}}
{{gmtInfo}}
', link: function(scope, element, attrs) { var format, // date format stopTime; // so that we can cancel the time updates - var o = {}; //angular.copy(defaults) + var o = {}; var gmtOffset = scope.gmtOffset; - var digitalFormat = scope.digitalFormat !== undefined ? scope.digitalFormat : 'HH:mm:ss'; - //o.gmtOffset = (gmtOffset !== undefined && gmtOffset !== null) ? parseFloat(gmtOffset) : false; - //o.showSecs = attrs.hideSecs !== undefined ? false : true; - //o.showAmPm = attrs.showAmPm !== undefined ? true : false; - o.showDigital = attrs.showDigital !== undefined ? true : false; - o.showAnalog = attrs.showAnalog !== undefined ? true : false; + var digitalFormat = scope.digitalFormat ? scope.digitalFormat : 'HH:mm:ss'; + o.showDigital = scope.showDigital != null ? scope.showDigital : attrs.showDigital !== undefined ? true : false; + o.showAnalog = scope.showAnalog != null ? scope.showAnalog : attrs.showAnalog !== undefined ? true : false; o.showGmtInfo = attrs.showGmtInfo !== undefined ? true : false; - o.startTime = parseInt(attrs.startTime, 10); // ms - scope.theme = attrs.theme !== undefined ? attrs.theme : 'light'; + o.startTime = parseInt(scope.startTime, 10); // ms + scope.themeClass = scope.theme ? scope.theme : attrs.theme ? attrs.theme : 'light'; if (!o.showDigital && !o.showAnalog) { o.showAnalog = true; o.showDigital = true; @@ -60,17 +64,38 @@ stopTime = $interval(tick, 1000); // watch the expression, and update the UI on change. - scope.$watch('gmtOffset', function(value) { + scope.$watch('gmtOffset', function(value, old) { + gmtOffset = value; - o.gmtOffset = (gmtOffset !== undefined && gmtOffset !== null) ? getGMTbase100(gmtOffset) : false; + o.gmtOffset = (gmtOffset != null) ? getGMTbase100(gmtOffset) : false; if (o.showGmtInfo && o.gmtOffset !== false) { scope.gmtInfo = getGMTText(o.gmtOffset); } + tick(); }); - /*scope.$watch('digitalFormat', function(value) { - digitalFormat = value; - });*/ + scope.$watch('digitalFormat', function(value, old) { + if(value != old){ + digitalFormat = value; + } + }); + scope.$watch('showDigital', function(value, old) { + if(value != old){ + o.showDigital = value; + scope.digital = o.showDigital ? 'Loading..' : false;; + } + }); + scope.$watch('showAnalog', function(value, old) { + if(value != old){ + o.showAnalog = value; + scope.analog = value; + } + }); + scope.$watch('theme', function(value, old) { + if(value != old){ + scope.themeClass = value ? value : attrs.theme ? attrs.theme : 'light'; + } + }); // listen on DOM destroy (removal) event, and cancel the next UI update // to prevent updating time after the DOM element was removed. element.on('$destroy', function() { @@ -123,10 +148,10 @@ function getDate(o) { var now = (!isNaN(o.startTime)) ? new Date(o.startTime) : new Date(); if (o.gmtOffset !== null && o.gmtOffset !== false) { - // Use GMT + gmtOffset - // convert to msec - // add local time zone offset - // get UTC time in msec + /*Use GMT + gmtOffset + convert to msec + add local time zone offset + get UTC time in msec*/ var utc = now.getTime() + (now.getTimezoneOffset() * 60000); // create new Date object for different city // using supplied offset @@ -150,11 +175,6 @@ function timeText(d, format, timezone, $filter) { return $filter('date')(d.date, format, timezone); - /*return '' + - (o.showAmPm ? ((d.hrs % 12) === 0 ? 12 : (d.hrs % 12)) : d.hrs) + ':' + - lpad(d.mins) + - (o.showSecs ? ':' + lpad(d.secs) : '') + - (o.showAmPm ? (d.hrs < 12 ? ' AM' : ' PM') : '');*/ } })(); diff --git a/dist/angular-clock.js.tar.gz b/dist/angular-clock.js.tar.gz index ba3bb0e574d81c7ecfdde21d7553bd2751d18c10..c566c6fbb100dc8765e7dbb87927f842d51e11a3 100644 GIT binary patch literal 6111 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 diff --git a/dist/angular-clock.min.js b/dist/angular-clock.min.js index 0e4dc34..9bcd335 100644 --- a/dist/angular-clock.min.js +++ b/dist/angular-clock.min.js @@ -1,2 +1,2 @@ -!function(){"use strict";function t(t,n){return{restrict:"EA",scope:{gmtOffset:"=gmtOffset",digitalFormat:"=digitalFormat"},template:'
{{digital}}
{{gmtInfo}}
',link:function(s,o,g){var l,m={},c=s.gmtOffset,f=void 0!==s.digitalFormat?s.digitalFormat:"HH:mm:ss";m.showDigital=void 0!==g.showDigital?!0:!1,m.showAnalog=void 0!==g.showAnalog?!0:!1,m.showGmtInfo=void 0!==g.showGmtInfo?!0:!1,m.startTime=parseInt(g.startTime,10),s.theme=void 0!==g.theme?g.theme:"light",m.showDigital||m.showAnalog||(m.showAnalog=!0,m.showDigital=!0),s.gmtInfo=!1,s.date=i(m),s.digital=m.showDigital?"Loading..":!1,s.analog=m.showAnalog,s.majors=new Array(12),s.minors=new Array(60);var d=null,u=function(){isNaN(m.startTime)||(m.startTime=m.startTime+1e3),d=i(m),s.date=d,m.showDigital&&(s.digital=r(d,f,c,n))};l=t(u,1e3),s.$watch("gmtOffset",function(t){c=t,m.gmtOffset=void 0!==c&&null!==c?e(c):!1,m.showGmtInfo&&m.gmtOffset!==!1&&(s.gmtInfo=a(m.gmtOffset)),u()}),o.on("$destroy",function(){t.cancel(l),l=null})}}}function e(t){t=parseFloat(t);var e=t>0?Math.floor(t):Math.ceil(t),a=t%1/.6;return e+a}function a(t){var e=t>0?Math.floor(t):Math.ceil(t),a=Math.round((t>0?t:-1*t)%1*60);return"GMT"+(0===t?"":(t>0?" +":" ")+n(e)+"."+s(a).substring(0,2))}function n(t){return 0>t?(t>-10?"-0":"-")+-1*t:(10>t?"0":"")+t}function s(t){return t+(10>t?"0":"")}function i(t){var e=isNaN(t.startTime)?new Date:new Date(t.startTime);if(null!==t.gmtOffset&&t.gmtOffset!==!1){var a=e.getTime()+6e4*e.getTimezoneOffset(),n=new Date(a+36e5*t.gmtOffset);return{hrs:n.getHours(),mins:n.getMinutes(),secs:n.getSeconds(),date:n}}return{hrs:e.getHours(),mins:e.getMinutes(),secs:e.getSeconds(),date:e}}function r(t,e,a,n){return n("date")(t.date,e,a)}angular.module("ds.clock",[]).directive("dsWidgetClock",["$interval","$filter",function(e,a){return t(e,a)}])}(); +!function(){"use strict";function t(t,n){return{restrict:"EA",scope:{gmtOffset:"=gmtOffset",digitalFormat:"=digitalFormat",showDigital:"=showDigital",showAnalog:"=showAnalog",startTime:"=startTime",theme:"=theme"},template:'
{{digital}}
{{gmtInfo}}
',link:function(s,r,l){var g,m={},c=s.gmtOffset,f=s.digitalFormat?s.digitalFormat:"HH:mm:ss";m.showDigital=null!=s.showDigital?s.showDigital:void 0!==l.showDigital?!0:!1,m.showAnalog=null!=s.showAnalog?s.showAnalog:void 0!==l.showAnalog?!0:!1,m.showGmtInfo=void 0!==l.showGmtInfo?!0:!1,m.startTime=parseInt(s.startTime,10),s.themeClass=s.theme?s.theme:l.theme?l.theme:"light",m.showDigital||m.showAnalog||(m.showAnalog=!0,m.showDigital=!0),s.gmtInfo=!1,s.date=i(m),s.digital=m.showDigital?"Loading..":!1,s.analog=m.showAnalog,s.majors=new Array(12),s.minors=new Array(60);var h=null,d=function(){isNaN(m.startTime)||(m.startTime=m.startTime+1e3),h=i(m),s.date=h,m.showDigital&&(s.digital=o(h,f,c,n))};g=t(d,1e3),s.$watch("gmtOffset",function(t){c=t,m.gmtOffset=null!=c?a(c):!1,m.showGmtInfo&&m.gmtOffset!==!1&&(s.gmtInfo=e(m.gmtOffset)),d()}),s.$watch("digitalFormat",function(t,a){t!=a&&(f=t)}),s.$watch("showDigital",function(t,a){t!=a&&(m.showDigital=t,s.digital=m.showDigital?"Loading..":!1)}),s.$watch("showAnalog",function(t,a){t!=a&&(m.showAnalog=t,s.analog=t)}),s.$watch("theme",function(t,a){t!=a&&(s.themeClass=t?t:l.theme?l.theme:"light")}),r.on("$destroy",function(){t.cancel(g),g=null})}}}function a(t){t=parseFloat(t);var a=t>0?Math.floor(t):Math.ceil(t),e=t%1/.6;return a+e}function e(t){var a=t>0?Math.floor(t):Math.ceil(t),e=Math.round((t>0?t:-1*t)%1*60);return"GMT"+(0===t?"":(t>0?" +":" ")+n(a)+"."+s(e).substring(0,2))}function n(t){return 0>t?(t>-10?"-0":"-")+-1*t:(10>t?"0":"")+t}function s(t){return t+(10>t?"0":"")}function i(t){var a=isNaN(t.startTime)?new Date:new Date(t.startTime);if(null!==t.gmtOffset&&t.gmtOffset!==!1){var e=a.getTime()+6e4*a.getTimezoneOffset(),n=new Date(e+36e5*t.gmtOffset);return{hrs:n.getHours(),mins:n.getMinutes(),secs:n.getSeconds(),date:n}}return{hrs:a.getHours(),mins:a.getMinutes(),secs:a.getSeconds(),date:a}}function o(t,a,e,n){return n("date")(t.date,a,e)}angular.module("ds.clock",[]).directive("dsWidgetClock",["$interval","$filter",function(a,e){return t(a,e)}])}(); //# sourceMappingURL=angular-clock.min.js.map \ No newline at end of file diff --git a/dist/angular-clock.min.js.map b/dist/angular-clock.min.js.map index 5d1f7bf..23f0858 100644 --- a/dist/angular-clock.min.js.map +++ b/dist/angular-clock.min.js.map @@ -1 +1 @@ -{"version":3,"sources":["angular-clock.min.js"],"names":["clock","$interval","$filter","restrict","scope","gmtOffset","digitalFormat","template","link","element","attrs","stopTime","o","undefined","showDigital","showAnalog","showGmtInfo","startTime","parseInt","theme","gmtInfo","date","getDate","digital","analog","majors","Array","minors","tick","isNaN","timeText","$watch","value","getGMTbase100","getGMTText","on","cancel","offset","parseFloat","f","Math","floor","ceil","s","round","lpad","rpad","substring","num","now","Date","utc","getTime","getTimezoneOffset","offsetNow","hrs","getHours","mins","getMinutes","secs","getSeconds","d","format","timezone","angular","module","directive"],"mappings":"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","file":"angular-clock.min.js","sourcesContent":["(function() {\r\n 'use strict';\r\n\r\n /* */\r\n var days = ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday'];\r\n var months = ['January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December'];\r\n\r\n angular.module('ds.clock', [])\r\n .directive('dsWidgetClock', ['$interval', '$filter',\r\n function($interval, $filter) {\r\n return clock($interval, $filter);\r\n }\r\n ]);\r\n\r\n function clock($interval, $filter) {\r\n return {\r\n restrict: 'EA',\r\n scope: {\r\n gmtOffset: '=gmtOffset',\r\n digitalFormat: '=digitalFormat'\r\n },\r\n template: '
{{digital}}
{{gmtInfo}}
',\r\n link: function(scope, element, attrs) {\r\n var format, // date format\r\n stopTime; // so that we can cancel the time updates\r\n var o = {}; //angular.copy(defaults)\r\n var gmtOffset = scope.gmtOffset;\r\n var digitalFormat = scope.digitalFormat !== undefined ? scope.digitalFormat : 'HH:mm:ss';\r\n //o.gmtOffset = (gmtOffset !== undefined && gmtOffset !== null) ? parseFloat(gmtOffset) : false;\r\n //o.showSecs = attrs.hideSecs !== undefined ? false : true;\r\n //o.showAmPm = attrs.showAmPm !== undefined ? true : false;\r\n o.showDigital = attrs.showDigital !== undefined ? true : false;\r\n o.showAnalog = attrs.showAnalog !== undefined ? true : false;\r\n o.showGmtInfo = attrs.showGmtInfo !== undefined ? true : false;\r\n o.startTime = parseInt(attrs.startTime, 10); // ms\r\n scope.theme = attrs.theme !== undefined ? attrs.theme : 'light';\r\n if (!o.showDigital && !o.showAnalog) {\r\n o.showAnalog = true;\r\n o.showDigital = true;\r\n }\r\n scope.gmtInfo = false;\r\n\r\n scope.date = getDate(o);\r\n\r\n scope.digital = o.showDigital ? 'Loading..' : false;\r\n scope.analog = o.showAnalog;\r\n scope.majors = new Array(12);\r\n scope.minors = new Array(60);\r\n var date = null;\r\n var tick = function() {\r\n if (!isNaN(o.startTime)) {\r\n o.startTime = o.startTime + 1000;\r\n }\r\n date = getDate(o);\r\n scope.date = date;\r\n if (o.showDigital) {\r\n scope.digital = timeText(date, digitalFormat, gmtOffset, $filter);\r\n }\r\n };\r\n\r\n stopTime = $interval(tick, 1000);\r\n // watch the expression, and update the UI on change.\r\n scope.$watch('gmtOffset', function(value) {\r\n gmtOffset = value;\r\n o.gmtOffset = (gmtOffset !== undefined && gmtOffset !== null) ? getGMTbase100(gmtOffset) : false;\r\n if (o.showGmtInfo && o.gmtOffset !== false) {\r\n scope.gmtInfo = getGMTText(o.gmtOffset);\r\n }\r\n tick();\r\n });\r\n /*scope.$watch('digitalFormat', function(value) {\r\n digitalFormat = value;\r\n });*/\r\n // listen on DOM destroy (removal) event, and cancel the next UI update\r\n // to prevent updating time after the DOM element was removed.\r\n element.on('$destroy', function() {\r\n $interval.cancel(stopTime);\r\n stopTime = null;\r\n });\r\n\r\n }\r\n };\r\n }\r\n\r\n function getGMTbase100(offset) {\r\n offset = parseFloat(offset);\r\n var f = offset > 0 ? Math.floor(offset) : Math.ceil(offset),\r\n s = (offset % 1) / 0.6;\r\n\r\n return f + s;\r\n\r\n }\r\n\r\n function getGMTbase60(offset) {\r\n var f = offset > 0 ? Math.floor(offset) : Math.ceil(offset),\r\n s = ((offset > 0 ? offset : offset * -1) % 1) * 60;\r\n return f + s;\r\n\r\n }\r\n\r\n function getGMTText(offset) {\r\n\r\n var f = offset > 0 ? Math.floor(offset) : Math.ceil(offset),\r\n s = Math.round(((offset > 0 ? offset : offset * -1) % 1) * 60);\r\n\r\n return 'GMT' + (offset === 0 ? '' : ((offset > 0 ? ' +' : ' ') + lpad(f) + '.' + rpad(s).substring(0, 2)));\r\n\r\n }\r\n\r\n function lpad(num) {\r\n if (num < 0) {\r\n return (num > -10 ? '-0' : '-') + (num * -1);\r\n } else {\r\n return (num < 10 ? '0' : '') + num;\r\n }\r\n\r\n }\r\n\r\n function rpad(num) {\r\n return num + (num < 10 ? '0' : '');\r\n }\r\n // Checkfor offset and get correct time\r\n function getDate(o) {\r\n var now = (!isNaN(o.startTime)) ? new Date(o.startTime) : new Date();\r\n if (o.gmtOffset !== null && o.gmtOffset !== false) {\r\n // Use GMT + gmtOffset\r\n // convert to msec\r\n // add local time zone offset\r\n // get UTC time in msec\r\n var utc = now.getTime() + (now.getTimezoneOffset() * 60000);\r\n // create new Date object for different city\r\n // using supplied offset\r\n var offsetNow = new Date(utc + (3600000 * o.gmtOffset));\r\n return {\r\n hrs: offsetNow.getHours(),\r\n mins: offsetNow.getMinutes(),\r\n secs: offsetNow.getSeconds(),\r\n date: offsetNow\r\n };\r\n } else {\r\n // Use local time\r\n return {\r\n hrs: now.getHours(),\r\n mins: now.getMinutes(),\r\n secs: now.getSeconds(),\r\n date: now\r\n };\r\n }\r\n }\r\n\r\n function timeText(d, format, timezone, $filter) {\r\n return $filter('date')(d.date, format, timezone);\r\n /*return '' +\r\n (o.showAmPm ? ((d.hrs % 12) === 0 ? 12 : (d.hrs % 12)) : d.hrs) + ':' +\r\n lpad(d.mins) +\r\n (o.showSecs ? ':' + lpad(d.secs) : '') +\r\n (o.showAmPm ? (d.hrs < 12 ? ' AM' : ' PM') : '');*/\r\n }\r\n\r\n})();\r\n"],"sourceRoot":"/source/"} \ No newline at end of file +{"version":3,"sources":["angular-clock.min.js"],"names":["clock","$interval","$filter","restrict","scope","gmtOffset","digitalFormat","showDigital","showAnalog","startTime","theme","template","link","element","attrs","stopTime","o","undefined","showGmtInfo","parseInt","themeClass","gmtInfo","date","getDate","digital","analog","majors","Array","minors","tick","isNaN","timeText","$watch","value","getGMTbase100","getGMTText","old","on","cancel","offset","parseFloat","f","Math","floor","ceil","s","round","lpad","rpad","substring","num","now","Date","utc","getTime","getTimezoneOffset","offsetNow","hrs","getHours","mins","getMinutes","secs","getSeconds","d","format","timezone","angular","module","directive"],"mappings":"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","file":"angular-clock.min.js","sourcesContent":["(function() {\r\n 'use strict';\r\n\r\n /**\r\n * Usage pattern\r\n * \r\n */\r\n var days = ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday'];\r\n var months = ['January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December'];\r\n\r\n angular.module('ds.clock', [])\r\n .directive('dsWidgetClock', ['$interval', '$filter',\r\n function($interval, $filter) {\r\n return clock($interval, $filter);\r\n }\r\n ]);\r\n\r\n function clock($interval, $filter) {\r\n return {\r\n restrict: 'EA',\r\n scope: {\r\n gmtOffset: '=gmtOffset',\r\n digitalFormat: '=digitalFormat',\r\n showDigital: '=showDigital',\r\n showAnalog: '=showAnalog',\r\n startTime: '=startTime',\r\n theme: '=theme'\r\n },\r\n template: '
{{digital}}
{{gmtInfo}}
',\r\n link: function(scope, element, attrs) {\r\n var format, // date format\r\n stopTime; // so that we can cancel the time updates\r\n var o = {};\r\n var gmtOffset = scope.gmtOffset;\r\n var digitalFormat = scope.digitalFormat ? scope.digitalFormat : 'HH:mm:ss';\r\n o.showDigital = scope.showDigital != null ? scope.showDigital : attrs.showDigital !== undefined ? true : false;\r\n o.showAnalog = scope.showAnalog != null ? scope.showAnalog : attrs.showAnalog !== undefined ? true : false;\r\n o.showGmtInfo = attrs.showGmtInfo !== undefined ? true : false;\r\n o.startTime = parseInt(scope.startTime, 10); // ms\r\n scope.themeClass = scope.theme ? scope.theme : attrs.theme ? attrs.theme : 'light';\r\n if (!o.showDigital && !o.showAnalog) {\r\n o.showAnalog = true;\r\n o.showDigital = true;\r\n }\r\n scope.gmtInfo = false;\r\n\r\n scope.date = getDate(o);\r\n\r\n scope.digital = o.showDigital ? 'Loading..' : false;\r\n scope.analog = o.showAnalog;\r\n scope.majors = new Array(12);\r\n scope.minors = new Array(60);\r\n var date = null;\r\n var tick = function() {\r\n if (!isNaN(o.startTime)) {\r\n o.startTime = o.startTime + 1000;\r\n }\r\n date = getDate(o);\r\n scope.date = date;\r\n if (o.showDigital) {\r\n scope.digital = timeText(date, digitalFormat, gmtOffset, $filter);\r\n }\r\n };\r\n\r\n stopTime = $interval(tick, 1000);\r\n // watch the expression, and update the UI on change.\r\n scope.$watch('gmtOffset', function(value, old) {\r\n \r\n gmtOffset = value;\r\n o.gmtOffset = (gmtOffset != null) ? getGMTbase100(gmtOffset) : false;\r\n if (o.showGmtInfo && o.gmtOffset !== false) {\r\n scope.gmtInfo = getGMTText(o.gmtOffset);\r\n }\r\n \r\n tick();\r\n });\r\n scope.$watch('digitalFormat', function(value, old) {\r\n if(value != old){\r\n digitalFormat = value;\r\n }\r\n });\r\n scope.$watch('showDigital', function(value, old) {\r\n if(value != old){\r\n o.showDigital = value;\r\n scope.digital = o.showDigital ? 'Loading..' : false;;\r\n }\r\n });\r\n scope.$watch('showAnalog', function(value, old) {\r\n if(value != old){\r\n o.showAnalog = value;\r\n scope.analog = value;\r\n }\r\n });\r\n scope.$watch('theme', function(value, old) {\r\n if(value != old){\r\n scope.themeClass = value ? value : attrs.theme ? attrs.theme : 'light';\r\n }\r\n });\r\n // listen on DOM destroy (removal) event, and cancel the next UI update\r\n // to prevent updating time after the DOM element was removed.\r\n element.on('$destroy', function() {\r\n $interval.cancel(stopTime);\r\n stopTime = null;\r\n });\r\n\r\n }\r\n };\r\n }\r\n\r\n function getGMTbase100(offset) {\r\n offset = parseFloat(offset);\r\n var f = offset > 0 ? Math.floor(offset) : Math.ceil(offset),\r\n s = (offset % 1) / 0.6;\r\n\r\n return f + s;\r\n\r\n }\r\n\r\n function getGMTbase60(offset) {\r\n var f = offset > 0 ? Math.floor(offset) : Math.ceil(offset),\r\n s = ((offset > 0 ? offset : offset * -1) % 1) * 60;\r\n return f + s;\r\n\r\n }\r\n\r\n function getGMTText(offset) {\r\n\r\n var f = offset > 0 ? Math.floor(offset) : Math.ceil(offset),\r\n s = Math.round(((offset > 0 ? offset : offset * -1) % 1) * 60);\r\n\r\n return 'GMT' + (offset === 0 ? '' : ((offset > 0 ? ' +' : ' ') + lpad(f) + '.' + rpad(s).substring(0, 2)));\r\n\r\n }\r\n\r\n function lpad(num) {\r\n if (num < 0) {\r\n return (num > -10 ? '-0' : '-') + (num * -1);\r\n } else {\r\n return (num < 10 ? '0' : '') + num;\r\n }\r\n\r\n }\r\n\r\n function rpad(num) {\r\n return num + (num < 10 ? '0' : '');\r\n }\r\n // Checkfor offset and get correct time\r\n function getDate(o) {\r\n var now = (!isNaN(o.startTime)) ? new Date(o.startTime) : new Date();\r\n if (o.gmtOffset !== null && o.gmtOffset !== false) {\r\n /*Use GMT + gmtOffset\r\n convert to msec\r\n add local time zone offset\r\n get UTC time in msec*/\r\n var utc = now.getTime() + (now.getTimezoneOffset() * 60000);\r\n // create new Date object for different city\r\n // using supplied offset\r\n var offsetNow = new Date(utc + (3600000 * o.gmtOffset));\r\n return {\r\n hrs: offsetNow.getHours(),\r\n mins: offsetNow.getMinutes(),\r\n secs: offsetNow.getSeconds(),\r\n date: offsetNow\r\n };\r\n } else {\r\n // Use local time\r\n return {\r\n hrs: now.getHours(),\r\n mins: now.getMinutes(),\r\n secs: now.getSeconds(),\r\n date: now\r\n };\r\n }\r\n }\r\n\r\n function timeText(d, format, timezone, $filter) {\r\n return $filter('date')(d.date, format, timezone);\r\n }\r\n\r\n})();\r\n"],"sourceRoot":"/source/"} \ No newline at end of file diff --git a/examples/app.js b/examples/app.js index 8a8cfb5..b14921b 100644 --- a/examples/app.js +++ b/examples/app.js @@ -11,13 +11,17 @@ app.controller('HeadCtrl', ['$scope', function($scope) { + $scope.theme = 'blue-light'; + $scope.digital = true; } ]); app.controller('BaseCtrl', ['$scope', function($scope) { - $scope.gmtValue = 5.45; - $scope.startTimeValue = 1430990693334; + $scope.gmtValue = 5.45; + $scope.startTimeValue = 1430990693334; + $scope.format = 'dd-MMM-yyyy hh:mm:ss a'; + } ]); diff --git a/examples/index.html b/examples/index.html index 0231e2e..6c31820 100644 --- a/examples/index.html +++ b/examples/index.html @@ -55,7 +55,13 @@
- + + + show digital

Angular Clock Widget

@@ -64,7 +70,7 @@

Angular Clock Widget

Code on Github - Download (0.4.0) + Download (0.5.0)

@@ -104,14 +110,16 @@

Options

There are several options that you can set as attributes on the directive element(can use other angular flavors like data-*, ng-attr-*, x-* also)

  1. start-time : init clock with specific time in milliseconds, (default: undefined)
    2. -
  2. digital-format : digital clock format in angular date filter format (default: 'HH-mm-ss'). Pass as string enclosed in single quate
    3. +
  3. digital-format : digital clock format in angular date filter format (default: 'HH-mm-ss'). Pass as string enclosed in single quote or bound to a scope variable
  4. gmt-offset : shows time for the given GMT offset in clock, (default: false, shows local time) example: India -> 5.30, Singapore -> 8 , venezula -> -4.30, Nepal -> 5.45
  5. show-digital: shows digital clock, (default: true if both show-analog &show-digital are not set)
  6. show-analog : shows analog clock, (default: true if both show-analog &show-digital are not set)
  7. show-gmt-info : shows GMT offset value, (default: false) shows only if gmt-offset attribute is set
  8. theme : analog clockface theme, (default: light)
-

All clocks are responsive and reactive and will update automatically when data changes.

+

All clocks are responsive and reactive and will update automatically when data changes. start-time, digital-format, + and gmt-offset are bound attributes and hence need to be set in the scope or using gmt-offset="'5.3'" format with extra single quotes.

+

show-digital, show-analog and theme can be used as bound attributes or as normal attributes

@@ -149,7 +157,7 @@

Directives

Clock with Start Time
- +
@@ -159,7 +167,7 @@

Directives

<ds-widget-clock start-time="{{startTimeValue}}"></ds-widget-clock>
+ data-language="xml"><ds-widget-clock start-time="startTimeValue"></ds-widget-clock> 
angular.module("app", ["ds.clock"]).controller("AppCtrl", function ($scope) {
@@ -258,11 +266,15 @@ 
Directives

                     

                         
                             
-                                
<ds-widget-clock theme="dark" digital-format="'hh:mm:ss a'"></ds-widget-clock>

+                                
<ds-widget-clock theme="dark" digital-format="'hh:mm:ss a'"></ds-widget-clock>
 
+                                or
+                                
<ds-widget-clock theme="theme" digital-format="'hh:mm:ss a'"></ds-widget-clock>

                             
                             
                                 
angular.module("app", ["ds.clock"]).controller("AppCtrl", function ($scope) {
 
+        $scope.theme = 'dark';
+
 });
               

                             
@@ -283,7 +295,7 @@ 
Directives

                                     

                                     
                                     

-                                    
+                                    
                                     

                                     
                                 

@@ -303,14 +315,14 @@ 
Directives

 <hr>
 <ds-widget-clock show-digital digital-format="'hh:mm:ss a'"> gmt-offset="5.3" show-gmt-info></ds-widget-clock>
 <hr>
-<ds-widget-clock show-digital digital-format="'dd-MMM-yyyy hh:mm:ss a'">></ds-widget-clock>
+<ds-widget-clock show-digital digital-format="format">></ds-widget-clock>
 <hr>
 <ds-widget-clock show-digital digital-format="'EEEE MMMM d,yyyy hh:mm:ss a Z'">></ds-widget-clock>
 
angular.module("app", ["ds.clock"]).controller("AppCtrl", function ($scope) {
-
+        $scope.format = 'dd-MMM-yyyy hh:mm:ss a';
 });
diff --git a/examples/index.template.html b/examples/index.template.html index 8b94f80..5ebf5ae 100644 --- a/examples/index.template.html +++ b/examples/index.template.html @@ -55,7 +55,13 @@
- + + + show digital

Angular Clock Widget

@@ -104,14 +110,16 @@

Options

There are several options that you can set as attributes on the directive element(can use other angular flavors like data-*, ng-attr-*, x-* also)

  1. start-time : init clock with specific time in milliseconds, (default: undefined)
    2. -
  2. digital-format : digital clock format in angular date filter format (default: 'HH-mm-ss'). Pass as string enclosed in single quate
    3. +
  3. digital-format : digital clock format in angular date filter format (default: 'HH-mm-ss'). Pass as string enclosed in single quote or bound to a scope variable
  4. gmt-offset : shows time for the given GMT offset in clock, (default: false, shows local time) example: India -> 5.30, Singapore -> 8 , venezula -> -4.30, Nepal -> 5.45
  5. show-digital: shows digital clock, (default: true if both show-analog &show-digital are not set)
  6. show-analog : shows analog clock, (default: true if both show-analog &show-digital are not set)
  7. show-gmt-info : shows GMT offset value, (default: false) shows only if gmt-offset attribute is set
  8. theme : analog clockface theme, (default: light)
-

All clocks are responsive and reactive and will update automatically when data changes.

+

All clocks are responsive and reactive and will update automatically when data changes. start-time, digital-format, + and gmt-offset are bound attributes and hence need to be set in the scope or using gmt-offset="'5.3'" format with extra single quotes.

+

show-digital, show-analog and theme can be used as bound attributes or as normal attributes

@@ -149,7 +157,7 @@

Directives

Clock with Start Time
- +
@@ -159,7 +167,7 @@

Directives

<ds-widget-clock start-time="{{startTimeValue}}"></ds-widget-clock>
+ data-language="xml"><ds-widget-clock start-time="startTimeValue"></ds-widget-clock> 
angular.module("app", ["ds.clock"]).controller("AppCtrl", function ($scope) {
@@ -258,11 +266,15 @@ 
Directives

                     

                         
                             
-                                
<ds-widget-clock theme="dark" digital-format="'hh:mm:ss a'"></ds-widget-clock>

+                                
<ds-widget-clock theme="dark" digital-format="'hh:mm:ss a'"></ds-widget-clock>
 
+                                or
+                                
<ds-widget-clock theme="theme" digital-format="'hh:mm:ss a'"></ds-widget-clock>

                             
                             
                                 
angular.module("app", ["ds.clock"]).controller("AppCtrl", function ($scope) {
 
+        $scope.theme = 'dark';
+
 });
               

                             
@@ -283,7 +295,7 @@ 
Directives

                                     

                                     
                                     

-                                    
+                                    
                                     

                                     
                                 

@@ -303,14 +315,14 @@ 
Directives

 <hr>
 <ds-widget-clock show-digital digital-format="'hh:mm:ss a'"> gmt-offset="5.3" show-gmt-info></ds-widget-clock>
 <hr>
-<ds-widget-clock show-digital digital-format="'dd-MMM-yyyy hh:mm:ss a'">></ds-widget-clock>
+<ds-widget-clock show-digital digital-format="format">></ds-widget-clock>
 <hr>
 <ds-widget-clock show-digital digital-format="'EEEE MMMM d,yyyy hh:mm:ss a Z'">></ds-widget-clock>
 
angular.module("app", ["ds.clock"]).controller("AppCtrl", function ($scope) {
-
+        $scope.format = 'dd-MMM-yyyy hh:mm:ss a';
 });
diff --git a/package.json b/package.json index 4bb5728..b682c49 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "angular-clock", - "version": "0.4.0", + "version": "0.5.0", "description": "An angular.js clock widget", "main": "angular-clock.js", "directories": {