ashatora/openlayers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Deal with ol.global issues

Browse Source
This commit is contained in:
Tim Schaub
2016-08-31 07:42:35 -06:00
parent 9e1a3f59e3
commit ff8a84a220
10 changed files with 64 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ol/net.js
+7 -6
View File
@@ -15,25 +15,26 @@ goog.require('ol');
* callback. Default is 'callback'.
*/
ol.net.jsonp = function(url, callback, opt_errback, opt_callbackParam) {
var script = ol.global.document.createElement('script');
var global = ol.global;
var script = global.document.createElement('script');
var key = 'olc_' + ol.getUid(callback);
function cleanup() {
delete ol.global[key];
delete global[key];
script.parentNode.removeChild(script);
}
script.async = true;
script.src = url + (url.indexOf('?') == -1 ? '?' : '&') +
(opt_callbackParam || 'callback') + '=' + key;
var timer = ol.global.setTimeout(function() {
var timer = global.setTimeout(function() {
cleanup();
if (opt_errback) {
opt_errback();
}
}, 10000);
ol.global[key] = function(data) {
ol.global.clearTimeout(timer);
global[key] = function(data) {
global.clearTimeout(timer);
cleanup();
callback(data);
};
ol.global.document.getElementsByTagName('head')[0].appendChild(script);
document.getElementsByTagName('head')[0].appendChild(script);
};