From 3632f5c8285479b82caa8b6d4153f798bf2b449b Mon Sep 17 00:00:00 2001 From: Philip Diffenderfer Date: Thu, 10 Nov 2016 00:15:38 -0500 Subject: [PATCH] Change use of global to window where applicable. (resolves #356) --- build/rekord.js | 32 +++++++++++++++++--------------- src/header.js | 2 ++ src/lib/functions/settings.js | 6 +++--- src/lib/offline.js | 12 ++++++------ src/lib/plugins/files.js | 12 ++++++------ 5 files changed, 34 insertions(+), 30 deletions(-) diff --git a/build/rekord.js b/build/rekord.js index 73606d5..66b4d36 100644 --- a/build/rekord.js +++ b/build/rekord.js @@ -24,6 +24,8 @@ }(this, function(global, undefined) { + var win = typeof window !== 'undefined' ? window : global; // jshint ignore:line + var AP = Array.prototype; @@ -2122,11 +2124,11 @@ function createPropertyResolver(properties) } -var Settings = global.RekordSettings || {}; +var Settings = global.RekordSettings || win.RekordSettings || {}; -if ( global.document && global.document.currentScript ) +if ( win.document && win.document.currentScript ) { - var script = global.document.currentScript; + var script = win.document.currentScript; if (script.getAttribute('native-array') !== null) { @@ -3023,7 +3025,7 @@ Rekord.setLive = function(factory, overwrite) Rekord.isOnline = function() { - return !global.navigator || global.navigator.onLine !== false; + return !win.navigator || win.navigator.onLine !== false; }; Rekord.online = Rekord.isOnline(); @@ -3054,15 +3056,15 @@ Rekord.setOffline = function() // online/offline detection instead of solely using status codes of 0. Rekord.listenToNetworkStatus = function() { - if (global.addEventListener) + if (win.addEventListener) { - global.addEventListener( Rekord.Events.Online, Rekord.setOnline, false ); - global.addEventListener( Rekord.Events.Offline, Rekord.setOffline, false ); + win.addEventListener( Rekord.Events.Online, Rekord.setOnline, false ); + win.addEventListener( Rekord.Events.Offline, Rekord.setOffline, false ); } else { - global.document.body.ononline = Rekord.setOnline; - global.document.body.onoffline = Rekord.setOffline; + win.document.body.ononline = Rekord.setOnline; + win.document.body.onoffline = Rekord.setOffline; } }; @@ -16415,20 +16417,20 @@ Rekord.fileProperties = function isFilesSupported() { - return global.File && global.FileReader && global.FileList; + return win.File && win.FileReader && win.FileList; } function toFile(input) { - if ( input instanceof global.File ) + if ( input instanceof win.File ) { return input; } - else if ( input instanceof global.Blob ) + else if ( input instanceof win.Blob ) { return input; } - else if ( input instanceof global.FileList && input.length > 0 ) + else if ( input instanceof win.FileList && input.length > 0 ) { return input[0]; } @@ -16503,7 +16505,7 @@ function fileReader(method, converter, options) { var processor = Rekord.fileProcessors[ options.processor ]; - if ( !(method in global.FileReader.prototype) ) + if ( !(method in win.FileReader.prototype) ) { Rekord.trigger( Rekord.Events.FilesNotSupported ); } @@ -16514,7 +16516,7 @@ function fileReader(method, converter, options) if ( file !== false ) { - var reader = new global.FileReader(); + var reader = new win.FileReader(); var result; var done = false; diff --git a/src/header.js b/src/header.js index ddae62a..238d8a4 100644 --- a/src/header.js +++ b/src/header.js @@ -22,3 +22,5 @@ } }(this, function(global, undefined) { + + var win = typeof window !== 'undefined' ? window : global; // jshint ignore:line diff --git a/src/lib/functions/settings.js b/src/lib/functions/settings.js index 8345213..588cb94 100644 --- a/src/lib/functions/settings.js +++ b/src/lib/functions/settings.js @@ -1,9 +1,9 @@ -var Settings = global.RekordSettings || {}; +var Settings = global.RekordSettings || win.RekordSettings || {}; -if ( global.document && global.document.currentScript ) +if ( win.document && win.document.currentScript ) { - var script = global.document.currentScript; + var script = win.document.currentScript; if (script.getAttribute('native-array') !== null) { diff --git a/src/lib/offline.js b/src/lib/offline.js index 40d265f..af737c7 100644 --- a/src/lib/offline.js +++ b/src/lib/offline.js @@ -3,7 +3,7 @@ Rekord.isOnline = function() { - return !global.navigator || global.navigator.onLine !== false; + return !win.navigator || win.navigator.onLine !== false; }; Rekord.online = Rekord.isOnline(); @@ -34,15 +34,15 @@ Rekord.setOffline = function() // online/offline detection instead of solely using status codes of 0. Rekord.listenToNetworkStatus = function() { - if (global.addEventListener) + if (win.addEventListener) { - global.addEventListener( Rekord.Events.Online, Rekord.setOnline, false ); - global.addEventListener( Rekord.Events.Offline, Rekord.setOffline, false ); + win.addEventListener( Rekord.Events.Online, Rekord.setOnline, false ); + win.addEventListener( Rekord.Events.Offline, Rekord.setOffline, false ); } else { - global.document.body.ononline = Rekord.setOnline; - global.document.body.onoffline = Rekord.setOffline; + win.document.body.ononline = Rekord.setOnline; + win.document.body.onoffline = Rekord.setOffline; } }; diff --git a/src/lib/plugins/files.js b/src/lib/plugins/files.js index 2d0f1ff..df6afb5 100644 --- a/src/lib/plugins/files.js +++ b/src/lib/plugins/files.js @@ -67,20 +67,20 @@ Rekord.fileProperties = function isFilesSupported() { - return global.File && global.FileReader && global.FileList; + return win.File && win.FileReader && win.FileList; } function toFile(input) { - if ( input instanceof global.File ) + if ( input instanceof win.File ) { return input; } - else if ( input instanceof global.Blob ) + else if ( input instanceof win.Blob ) { return input; } - else if ( input instanceof global.FileList && input.length > 0 ) + else if ( input instanceof win.FileList && input.length > 0 ) { return input[0]; } @@ -155,7 +155,7 @@ function fileReader(method, converter, options) { var processor = Rekord.fileProcessors[ options.processor ]; - if ( !(method in global.FileReader.prototype) ) + if ( !(method in win.FileReader.prototype) ) { Rekord.trigger( Rekord.Events.FilesNotSupported ); } @@ -166,7 +166,7 @@ function fileReader(method, converter, options) if ( file !== false ) { - var reader = new global.FileReader(); + var reader = new win.FileReader(); var result; var done = false;