glenux-contrib/metamaps--metamaps
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge a0d9d9caa4 into 2e6493fd23

Browse source
This commit is contained in:
Devin Howard 2016-03-03 09:25:40 +00:00
commit f7e8b2de1e
2 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/assets/javascripts/src/Metamaps.GlobalUI.js.erb
View file

@ -49,7 +49,10 @@ $(document).ready(function () {
// this runs the init function within each sub-object on the Metamaps one
if (Metamaps.hasOwnProperty(prop) &&
Metamaps[prop].hasOwnProperty('init') &&
typeof (Metamaps[prop].init) == 'function'
typeof Metamaps[prop] === 'object' &&
!Array.isArray(Metamaps[prop]) && # ugh
Metamaps[prop] !== null && # double ugh
typeof (Metamaps[prop].init) === 'function'
) {
Metamaps[prop].init();
}

11
app/assets/javascripts/src/Metamaps.js.erb
View file

@ -17,12 +17,11 @@ var labelType, useGradients, nativeTextSupport, animate;
})();
// TODO eliminate these 4 top-level variables
Metamaps = {
panningInt: null,
tempNode: null,
tempInit: false,
tempNode2: null
}
Metamaps = window.Metamaps || {};
Metamaps.panningInt = null;
Metamaps.tempNode = null;
Metamaps.tempInit = false;
Metamaps.tempNode2 = null;
Metamaps.Settings = {
embed: false, // indicates that the app is on a page that is optimized for embedding in iFrames on other web pages