tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

BUGFIX Renamed property "queue" to "ondemand_queue" to make compatible with jQuery 1.3

Browse Source 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@92487 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Ingo Schommer 2009-11-21 02:22:57 +00:00
parent 036b77a54d
commit 396a25b96f
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
javascript/core/jquery.ondemand.js
View File

@ -1,6 +1,9 @@
/** /**
* On-demand JavaScript handler * On-demand JavaScript handler
* Based on http://plugins.jquery.com/files/issues/jquery.ondemand.js_.txt and modified to integrate with Sapphire * Based on http://plugins.jquery.com/files/issues/jquery.ondemand.js_.txt and modified to integrate with Sapphire
*
* Modified 2009-08-03 by Ingo Schommer, SilverStripe Ltd. - Renamed property "queue" to "ondemand_queue"
* to make compatible with jQuery 1.3
*/ */
(function($){ (function($){
@ -16,7 +19,7 @@
routeCss : '' // choice of using this config or full path in scriptUrl argument routeCss : '' // choice of using this config or full path in scriptUrl argument
}, // previously were useless for users which don't use '_js/' and '_css/' folders. (by PGA) }, // previously were useless for users which don't use '_js/' and '_css/' folders. (by PGA)
queue : [], ondemand_queue : [],
pending : null, pending : null,
loaded_list : null, // loaded files list - to protect against loading existed file again (by PGA) loaded_list : null, // loaded files list - to protect against loading existed file again (by PGA)
@ -60,7 +63,7 @@
if(this.pending) if(this.pending)
{ {
this.queue.push(_request); this.ondemand_queue.push(_request);
return; return;
} }
@ -114,9 +117,9 @@
this.loaded_list[this.pending.url] = 1; // adding loaded file to loaded list (by PGA) this.loaded_list[this.pending.url] = 1; // adding loaded file to loaded list (by PGA)
this.pending = null; this.pending = null;
if(this.queue.length > 0) if(this.ondemand_queue.length > 0)
{ {
var request = this.queue.shift(); var request = this.ondemand_queue.shift();
this.requireJs(request.url, request.callback, request.opts, request.obj, request.scope); this.requireJs(request.url, request.callback, request.opts, request.obj, request.scope);
} }
}, },