diff --git a/package.json b/package.json index a75928c..5a7c8d9 100644 --- a/package.json +++ b/package.json @@ -25,7 +25,7 @@ "eventemitter3": "^0.1.6", "object-assign": "^2.0.0", "pixi-spine": "^1.0.1", - "resource-loader": "^1.3.2" + "resource-loader": "^1.4.0" }, "devDependencies": { "browserify": "^8.0.2", diff --git a/package.json b/package.json index a75928c..5a7c8d9 100644 --- a/package.json +++ b/package.json @@ -25,7 +25,7 @@ "eventemitter3": "^0.1.6", "object-assign": "^2.0.0", "pixi-spine": "^1.0.1", - "resource-loader": "^1.3.2" + "resource-loader": "^1.4.0" }, "devDependencies": { "browserify": "^8.0.2", diff --git a/src/loaders/bitmapFontParser.js b/src/loaders/bitmapFontParser.js index 52672d4..5ffdf77 100644 --- a/src/loaders/bitmapFontParser.js +++ b/src/loaders/bitmapFontParser.js @@ -62,16 +62,8 @@ { return function (resource, next) { - // skip if no data - if (!resource.data) - { - return next(); - } - - var name = resource.data.nodeName && resource.data.nodeName.toLowerCase(); - - // skip if not xml data - if (!name || (name !== '#document' && name !== 'div')) + // skip if no data or not xml data + if (!resource.data || !resource.isXml) { return next(); } diff --git a/package.json b/package.json index a75928c..5a7c8d9 100644 --- a/package.json +++ b/package.json @@ -25,7 +25,7 @@ "eventemitter3": "^0.1.6", "object-assign": "^2.0.0", "pixi-spine": "^1.0.1", - "resource-loader": "^1.3.2" + "resource-loader": "^1.4.0" }, "devDependencies": { "browserify": "^8.0.2", diff --git a/src/loaders/bitmapFontParser.js b/src/loaders/bitmapFontParser.js index 52672d4..5ffdf77 100644 --- a/src/loaders/bitmapFontParser.js +++ b/src/loaders/bitmapFontParser.js @@ -62,16 +62,8 @@ { return function (resource, next) { - // skip if no data - if (!resource.data) - { - return next(); - } - - var name = resource.data.nodeName && resource.data.nodeName.toLowerCase(); - - // skip if not xml data - if (!name || (name !== '#document' && name !== 'div')) + // skip if no data or not xml data + if (!resource.data || !resource.isXml) { return next(); } diff --git a/src/loaders/spineAtlasParser.js b/src/loaders/spineAtlasParser.js index 0f4b593..2bf5fdc 100644 --- a/src/loaders/spineAtlasParser.js +++ b/src/loaders/spineAtlasParser.js @@ -6,8 +6,8 @@ { return function (resource, next) { - // skip if no data - if (!resource.data || !resource.data.bones) + // skip if no data, its not json, or it isn't atlas data + if (!resource.data || !resource.isJson || !resource.data.bones) { return next(); } diff --git a/package.json b/package.json index a75928c..5a7c8d9 100644 --- a/package.json +++ b/package.json @@ -25,7 +25,7 @@ "eventemitter3": "^0.1.6", "object-assign": "^2.0.0", "pixi-spine": "^1.0.1", - "resource-loader": "^1.3.2" + "resource-loader": "^1.4.0" }, "devDependencies": { "browserify": "^8.0.2", diff --git a/src/loaders/bitmapFontParser.js b/src/loaders/bitmapFontParser.js index 52672d4..5ffdf77 100644 --- a/src/loaders/bitmapFontParser.js +++ b/src/loaders/bitmapFontParser.js @@ -62,16 +62,8 @@ { return function (resource, next) { - // skip if no data - if (!resource.data) - { - return next(); - } - - var name = resource.data.nodeName && resource.data.nodeName.toLowerCase(); - - // skip if not xml data - if (!name || (name !== '#document' && name !== 'div')) + // skip if no data or not xml data + if (!resource.data || !resource.isXml) { return next(); } diff --git a/src/loaders/spineAtlasParser.js b/src/loaders/spineAtlasParser.js index 0f4b593..2bf5fdc 100644 --- a/src/loaders/spineAtlasParser.js +++ b/src/loaders/spineAtlasParser.js @@ -6,8 +6,8 @@ { return function (resource, next) { - // skip if no data - if (!resource.data || !resource.data.bones) + // skip if no data, its not json, or it isn't atlas data + if (!resource.data || !resource.isJson || !resource.data.bones) { return next(); } diff --git a/src/loaders/spritesheetParser.js b/src/loaders/spritesheetParser.js index 685551c..83bd096 100644 --- a/src/loaders/spritesheetParser.js +++ b/src/loaders/spritesheetParser.js @@ -6,8 +6,8 @@ { return function (resource, next) { - // skip if no data - if (!resource.data || !resource.data.frames) + // skip if no data, its not json, or it isn't spritesheet data + if (!resource.data || !resource.isJson || !resource.data.frames) { return next(); } diff --git a/package.json b/package.json index a75928c..5a7c8d9 100644 --- a/package.json +++ b/package.json @@ -25,7 +25,7 @@ "eventemitter3": "^0.1.6", "object-assign": "^2.0.0", "pixi-spine": "^1.0.1", - "resource-loader": "^1.3.2" + "resource-loader": "^1.4.0" }, "devDependencies": { "browserify": "^8.0.2", diff --git a/src/loaders/bitmapFontParser.js b/src/loaders/bitmapFontParser.js index 52672d4..5ffdf77 100644 --- a/src/loaders/bitmapFontParser.js +++ b/src/loaders/bitmapFontParser.js @@ -62,16 +62,8 @@ { return function (resource, next) { - // skip if no data - if (!resource.data) - { - return next(); - } - - var name = resource.data.nodeName && resource.data.nodeName.toLowerCase(); - - // skip if not xml data - if (!name || (name !== '#document' && name !== 'div')) + // skip if no data or not xml data + if (!resource.data || !resource.isXml) { return next(); } diff --git a/src/loaders/spineAtlasParser.js b/src/loaders/spineAtlasParser.js index 0f4b593..2bf5fdc 100644 --- a/src/loaders/spineAtlasParser.js +++ b/src/loaders/spineAtlasParser.js @@ -6,8 +6,8 @@ { return function (resource, next) { - // skip if no data - if (!resource.data || !resource.data.bones) + // skip if no data, its not json, or it isn't atlas data + if (!resource.data || !resource.isJson || !resource.data.bones) { return next(); } diff --git a/src/loaders/spritesheetParser.js b/src/loaders/spritesheetParser.js index 685551c..83bd096 100644 --- a/src/loaders/spritesheetParser.js +++ b/src/loaders/spritesheetParser.js @@ -6,8 +6,8 @@ { return function (resource, next) { - // skip if no data - if (!resource.data || !resource.data.frames) + // skip if no data, its not json, or it isn't spritesheet data + if (!resource.data || !resource.isJson || !resource.data.frames) { return next(); } diff --git a/src/loaders/textureParser.js b/src/loaders/textureParser.js index 6ed2884..9690dcd 100644 --- a/src/loaders/textureParser.js +++ b/src/loaders/textureParser.js @@ -5,7 +5,7 @@ return function (resource, next) { // create a new texture if the data is an Image object - if (resource.data && resource.data.nodeName && resource.data.nodeName.toLowerCase() === 'img') + if (resource.data && resource.isImage) { resource.texture = new core.Texture(new core.BaseTexture(resource.data, null, core.utils.getResolutionOfUrl(resource.url))); // lets also add the frame to pixi's global cache for fromFrame and fromImage fucntions