tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-09-28 12:26:23 +02:00
Code Issues Projects Releases Wiki Activity

Revert "BUG Fix duplicate files being included in case of flush"

Browse Source
This commit is contained in:
Damian Mooyman 2015-11-02 17:11:22 +13:00
parent b857bdf209
commit 074718fcfa
1 changed files with 7 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
javascript/jquery-ondemand/jquery.ondemand.js
View File

@ -15,74 +15,34 @@
*/
(function($){
/**
* Decode URL from header string
*
* @param {String} str
* @returns {String}
*/
var decodePath = function(str) {
return str.replace(/%2C/g,',').replace(/\&/g, '&').replace(/^\s+|\s+$/g, '');
};
/**
* Remove querystring from the url. Necessary to prevent a file being included twice in the same page if
* requested at different times (e.g. during flush)
*
* @param {String} str
* @returns {String}
*/
var removeQuerystring = function(str) {
return str.split("?")[0];
};
$.extend({
// loaded files list - to protect against loading existed file again (by PGA)
_ondemand_loaded_list : null,
/**
* Add a new url to the loaded item
*
* @param {String} url
*/
registerLoadedItem : function(url) {
this._ondemand_loaded_list[removeQuerystring(url)] = 1;
},
/**
* Returns true if the given CSS or JS script has already been loaded
*
* @param {String} scriptUrl Decoded CSS or JS file url
* @returns {Boolean}
*/
isItemLoaded : function(scriptUrl) {
var self = this, src, result;
var self = this, src;
if(this._ondemand_loaded_list === null) {
this._ondemand_loaded_list = {};
$('script').each(function() {
src = $(this).attr('src');
if(src) {
self.registerLoadedItem(src);
}
if(src) self._ondemand_loaded_list[src] = 1;
});
$('link[rel="stylesheet"]').each(function() {
src = $(this).attr('href');
if(src) {
self.registerLoadedItem(src);
}
if(src) self._ondemand_loaded_list[src] = 1;
});
}
result = this._ondemand_loaded_list[removeQuerystring(scriptUrl)];
return typeof result !== 'undefined';
return (this._ondemand_loaded_list[decodePath(scriptUrl)] !== undefined);
},
/**
* Requires a CSS File
*
* @param {String} styleUrl Decoded CSS file url
* @param {String} media
*/
requireCss : function(styleUrl, media){
if(!media) media = 'all';
@ -93,7 +53,6 @@
var ss = document.createStyleSheet(styleUrl);
ss.media = media;
} else {
var styleTag = document.createElement('link');
$(styleTag).attr({
@ -104,7 +63,8 @@
}).appendTo($('head').get(0));
}
this.registerLoadedItem(styleUrl);
this._ondemand_loaded_list[styleUrl] = 1;
},
/**
@ -150,7 +110,7 @@
dataType: 'script',
url: newJsInclude,
success: function() {
self.registerLoadedItem(newJsInclude);
self._ondemand_loaded_list[newJsInclude] = 1;
getScriptQueue();
},
cache: false,