From 6a3b7cfb2f93a75a0e7204e90deec8b653043644 Mon Sep 17 00:00:00 2001 From: Kevin Ewing Date: Wed, 19 Jun 2013 10:57:09 -0700 Subject: [PATCH 1/4] Added OpenSeadragon.now() --- src/openseadragon.js | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/openseadragon.js b/src/openseadragon.js index c00673c8..ab4b6961 100644 --- a/src/openseadragon.js +++ b/src/openseadragon.js @@ -635,6 +635,20 @@ window.OpenSeadragon = window.OpenSeadragon || function( options ){ }, + /** + * Returns the current milliseconds, using Date.now() if available + * @name $.now + * @function + */ + now: function( ) { + if (Date.now) { + return Date.now(); + } + + return new Date().getTime(); + }, + + /** * An enumeration of Browser vendors including UNKNOWN, IE, FIREFOX, * SAFARI, CHROME, and OPERA. From e8408c131347df920f0057b9697ad25bec6cdc47 Mon Sep 17 00:00:00 2001 From: Kevin Ewing Date: Wed, 19 Jun 2013 11:16:45 -0700 Subject: [PATCH 2/4] Moved to better location --- src/openseadragon.js | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/src/openseadragon.js b/src/openseadragon.js index ab4b6961..7f52a600 100644 --- a/src/openseadragon.js +++ b/src/openseadragon.js @@ -635,20 +635,6 @@ window.OpenSeadragon = window.OpenSeadragon || function( options ){ }, - /** - * Returns the current milliseconds, using Date.now() if available - * @name $.now - * @function - */ - now: function( ) { - if (Date.now) { - return Date.now(); - } - - return new Date().getTime(); - }, - - /** * An enumeration of Browser vendors including UNKNOWN, IE, FIREFOX, * SAFARI, CHROME, and OPERA. @@ -966,6 +952,20 @@ window.OpenSeadragon = window.OpenSeadragon || function( options ){ }, + /** + * Returns the current milliseconds, using Date.now() if available + * @name $.now + * @function + */ + now: function( ) { + if (Date.now) { + return Date.now(); + } + + return new Date().getTime(); + }, + + /** * Ensures an image is loaded correctly to support alpha transparency. * Generally only IE has issues doing this correctly for formats like From 2f8a26fda0d25184f28afff485f328a8d0c680f1 Mon Sep 17 00:00:00 2001 From: Kevin Ewing Date: Wed, 19 Jun 2013 15:13:56 -0700 Subject: [PATCH 3/4] Responding to feedback Function now re-assigns itself on the first go round to avoid doing the check every time it is called --- src/openseadragon.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/openseadragon.js b/src/openseadragon.js index 5b65710c..55b7b386 100644 --- a/src/openseadragon.js +++ b/src/openseadragon.js @@ -959,10 +959,10 @@ window.OpenSeadragon = window.OpenSeadragon || function( options ){ */ now: function( ) { if (Date.now) { - return Date.now(); + $.now = Date.now; + } else { + $.now = function() { return new Date().getTime(); } } - - return new Date().getTime(); }, From 0984106983ba34fa90d3eeaf72032e2e55c6da37 Mon Sep 17 00:00:00 2001 From: Kevin Ewing Date: Thu, 20 Jun 2013 09:08:21 -0700 Subject: [PATCH 4/4] Added missing semicolon --- src/openseadragon.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/openseadragon.js b/src/openseadragon.js index 55b7b386..dad43393 100644 --- a/src/openseadragon.js +++ b/src/openseadragon.js @@ -961,7 +961,7 @@ window.OpenSeadragon = window.OpenSeadragon || function( options ){ if (Date.now) { $.now = Date.now; } else { - $.now = function() { return new Date().getTime(); } + $.now = function() { return new Date().getTime(); }; } },