Skip to content

Commit

Permalink
Change use of global to window where applicable. (resolves #356)
Browse files Browse the repository at this point in the history
  • Loading branch information
@ClickerMonkey
ClickerMonkey committed Nov 10, 2016
1 parent 92b9cb0 commit 3632f5c
Show file tree
Hide file tree
Showing 5 changed files with 34 additions and 30 deletions.
32 changes: 17 additions & 15 deletions build/rekord.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@
}(this, function(global, undefined)
{

var win = typeof window !== 'undefined' ? window : global; // jshint ignore:line


var AP = Array.prototype;

Expand Down Expand Up @@ -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)
{
Expand Down Expand Up @@ -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();
Expand Down Expand Up @@ -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;
}
};

Expand Down Expand Up @@ -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];
}
Expand Down Expand Up @@ -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 );
}
Expand All @@ -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;

Expand Down
2 changes: 2 additions & 0 deletions src/header.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,5 @@
}
}(this, function(global, undefined)
{

var win = typeof window !== 'undefined' ? window : global; // jshint ignore:line
6 changes: 3 additions & 3 deletions src/lib/functions/settings.js
View file
Original file line number Diff line number Diff line change
@@ -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)
{
Expand Down
12 changes: 6 additions & 6 deletions src/lib/offline.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down Expand Up @@ -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;
}
};

Expand Down
12 changes: 6 additions & 6 deletions src/lib/plugins/files.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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];
}
Expand Down Expand Up @@ -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 );
}
Expand All @@ -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;

Expand Down

0 comments on commit 3632f5c

Please sign in to comment.