Skip to content

fix(tagAppender): make sure a file won't load twice (even when called… #19

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

fix(tagAppender): make sure a file won't load twice (even when called… #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions angular-widget.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@ angular.module("angularWidgetInternal").directive("ngWidget", [ "$http", "$templ
angular.module("angularWidgetInternal").value("headElement", document.getElementsByTagName("head")[0]).factory("requirejs", function() {
return window.requirejs || null;
}).value("navigator", navigator).factory("tagAppender", [ "$q", "$rootScope", "headElement", "$interval", "navigator", "$document", "requirejs", "$browser", function($q, $rootScope, headElement, $interval, navigator, $document, requirejs, $browser) {
var requireCache = [];
var requireCache = {};
var styleSheets = $document[0].styleSheets;
function noprotocol(url) {
return url.replace(/^.*:\/\//, "//");
Expand All @@ -252,10 +252,10 @@ angular.module("angularWidgetInternal").value("headElement", document.getElement
});
return deferred.promise;
}
if (requireCache.indexOf(url) !== -1) {
deferred.resolve();
return deferred.promise;
if (url in requireCache) {
return requireCache[url];
}
requireCache[url] = deferred.promise;
var fileref;
if (filetype === "css") {
fileref = angular.element("<link></link>")[0];
Expand All @@ -271,6 +271,7 @@ angular.module("angularWidgetInternal").value("headElement", document.getElement
headElement.appendChild(fileref);
fileref.onerror = function() {
fileref.onerror = fileref.onload = fileref.onreadystatechange = null;
delete requireCache[url];
if ($rootScope.$$phase) {
deferred.reject();
} else {
Expand All @@ -283,7 +284,6 @@ angular.module("angularWidgetInternal").value("headElement", document.getElement
if (!done && (!this.readyState || this.readyState === "loaded" || this.readyState === "complete")) {
done = true;
fileref.onerror = fileref.onload = fileref.onreadystatechange = null;
requireCache.push(url);
if ($rootScope.$$phase) {
deferred.resolve();
} else {
Expand Down
11 changes: 5 additions & 6 deletions app/scripts/services/tag-appender.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ angular.module('angularWidgetInternal')
})
.value('navigator', navigator)
.factory('tagAppender', function ($q, $rootScope, headElement, $interval, navigator, $document, requirejs, $browser) {
var requireCache = [];
var requireCache = {};
var styleSheets = $document[0].styleSheets;

function noprotocol(url) {
Expand All @@ -31,10 +31,10 @@ angular.module('angularWidgetInternal')
});
return deferred.promise;
}
if (requireCache.indexOf(url) !== -1) {
deferred.resolve();
return deferred.promise;
if (url in requireCache) {
return requireCache[url];
}
requireCache[url] = deferred.promise;

var fileref;
if (filetype === 'css') {
Expand All @@ -52,7 +52,7 @@ angular.module('angularWidgetInternal')
headElement.appendChild(fileref);
fileref.onerror = function () {
fileref.onerror = fileref.onload = fileref.onreadystatechange = null;

delete requireCache[url];
//the $$phase test is required due to $interval mock, should be removed when $interval is fixed
if ($rootScope.$$phase) {
deferred.reject();
Expand All @@ -66,7 +66,6 @@ angular.module('angularWidgetInternal')
if (!done && (!this.readyState || this.readyState === 'loaded' || this.readyState === 'complete')) {
done = true;
fileref.onerror = fileref.onload = fileref.onreadystatechange = null;
requireCache.push(url);

//the $$phase test is required due to $interval mock, should be removed when $interval is fixed
if ($rootScope.$$phase) {
Expand Down
26 changes: 26 additions & 0 deletions test/spec/services/tag-appender.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,24 @@ describe('Unit testing tagAppender service', function () {
.toBe('<script type="text/javascript" src="dummy.js"></script>');
}));

it('should return the same promise when same file loads twice simultaneously ', inject (function (tagAppender) {
var firstLoadPromise = tagAppender('dummy.js', 'js');
var secondLoadPromise = tagAppender('dummy.js', 'js');
expect(firstLoadPromise).toEqual(secondLoadPromise);
}));

it('should re try to download the file in case first attempt failed', inject (function (tagAppender) {
var secondAttemptSuccess = jasmine.createSpy('secondAttemptSuccess');

tagAppender('dummy.js', 'js').catch(function () {
tagAppender('dummy.js', 'js').then(secondAttemptSuccess);
simulateLoadSuccessOnCall(1);
});

simulateLoadErrorOnCall(0);
expect(secondAttemptSuccess).toHaveBeenCalled();
}));

it('should append link tag when css file is added', inject(function (tagAppender) {
tagAppender('dummy.css', 'css');
expect(headElement.appendChild.calls.length).toBe(1);
Expand Down Expand Up @@ -198,4 +216,12 @@ describe('Unit testing tagAppender service', function () {
expect(success.calls.length).toBe(1);
}));

function simulateLoadSuccessOnCall(callIndex) {
headElement.appendChild.calls[callIndex].args[0].onload();
}

function simulateLoadErrorOnCall(callIndex) {
headElement.appendChild.calls[callIndex].args[0].onerror();
}

});