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

Remove goog.global (#5178)

Browse Source 
* Remove goog.global

* Correct externs location

* Use Function('return this')

* Remove global externs
This commit is contained in:
Nicholas Latham
2016-04-08 09:36:48 +12:00
committed by Andreas Hocevar
parent 6efd3dab0b
commit cd6494149b
15 changed files with 54 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
test/spec/ol/interaction/draganddropinteraction.test.js
View File

@@ -62,7 +62,7 @@ describe('ol.interaction.DragAndDrop', function() {
});
describe('#handleDrop_', function() {
var origFileReader = goog.global.FileReader;
var origFileReader = ol.global.FileReader;
beforeEach(function() {
FileReader = function() {
@@ -76,7 +76,7 @@ describe('ol.interaction.DragAndDrop', function() {
});
afterEach(function() {
goog.global.FileReader = origFileReader;
ol.global.FileReader = origFileReader;
});
it('reads dropped files', function(done) {

14
test/spec/ol/net.test.js
View File

@@ -4,10 +4,10 @@ goog.provide('ol.test.net');
describe('ol.net', function() {
describe('jsonp()', function() {
var head = goog.global.document.getElementsByTagName('head')[0];
var head = ol.global.document.getElementsByTagName('head')[0];
var origAppendChild = head.appendChild;
var origCreateElement = document.createElement;
var origSetTimeout = goog.global.setTimeout;
var origSetTimeout = ol.global.setTimeout;
var key, removeChild;
function createCallback(url, done) {
@@ -27,7 +27,7 @@ describe('ol.net', function() {
if (arg == 'script') {
return element;
} else {
return origCreateElement.apply(goog.global.document, arguments);
return origCreateElement.apply(ol.global.document, arguments);
}
};
head.appendChild = function(el) {
@@ -36,13 +36,13 @@ describe('ol.net', function() {
removeChild: removeChild
};
origSetTimeout(function() {
goog.global[key](element.src);
ol.global[key](element.src);
}, 0);
} else {
origAppendChild.apply(head, arguments);
}
};
goog.global.setTimeout = function(fn, time) {
ol.global.setTimeout = function(fn, time) {
origSetTimeout(fn, 100);
};
});
@@ -50,7 +50,7 @@ describe('ol.net', function() {
afterEach(function() {
document.createElement = origCreateElement;
head.appendChild = origAppendChild;
goog.global.setTimeout = origSetTimeout;
ol.global.setTimeout = origSetTimeout;
});
it('appends callback param to url, cleans up after call', function(done) {
@@ -70,7 +70,7 @@ describe('ol.net', function() {
expect.fail();
}
function errback() {
expect(goog.global[key]).to.be(undefined);
expect(ol.global[key]).to.be(undefined);
expect(removeChild.called).to.be(true);
done();
}