javascript/NativeScript
1
0
Fork 0
mirror of https://github.com/NativeScript/NativeScript.git synced 2025-08-19 06:10:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fetch tests fixed

Browse Source
This commit is contained in:
Vladimir Enchev
2015-07-28 09:32:25 +03:00
parent 4589bc6565
commit 973fbb9ea9
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
globals/globals.ts
View File

@ -11,9 +11,6 @@ import timer = require("timer");
import consoleModule = require("console"); import consoleModule = require("console");
import xhr = require("xhr/xhr"); import xhr = require("xhr/xhr");
import dialogs = require("ui/dialogs"); import dialogs = require("ui/dialogs");
var fetchModule = require("fetch");
global.moduleMerge(fetchModule, global);
global.setTimeout = timer.setTimeout; global.setTimeout = timer.setTimeout;
global.clearTimeout = timer.clearTimeout; global.clearTimeout = timer.clearTimeout;
@ -29,6 +26,10 @@ global.XMLHttpRequest = xhr.XMLHttpRequest;
global.FormData = xhr.FormData; global.FormData = xhr.FormData;
global.alert = dialogs.alert; global.alert = dialogs.alert;
// Fetch module should be after XMLHttpRequest/FormData!
var fetchModule = require("fetch");
global.moduleMerge(fetchModule, global);
export function Deprecated(target: Object, key?: string | symbol, descriptor?: any) { export function Deprecated(target: Object, key?: string | symbol, descriptor?: any) {
if (descriptor) { if (descriptor) {
var originalMethod = descriptor.value; var originalMethod = descriptor.value;