Author: ornicar2
Date: 2010-01-18 15:17:46 +0100 (Mon, 18 Jan 2010)
New Revision: 26816
Modified:
plugins/diemPlugin/trunk/dmCorePlugin/web/js/dmCoreConfig.js
plugins/diemPlugin/trunk/dmCorePlugin/web/js/dmCoreEditCtrl.js
plugins/diemPlugin/trunk/dmCorePlugin/web/js/dmCoreEditPlugins.js
plugins/diemPlugin/trunk/dmCorePlugin/web/js/dmCorePageBar.js
Log:
[Diem]
- enhanced edition javascripts
Modified: plugins/diemPlugin/trunk/dmCorePlugin/web/js/dmCoreConfig.js
===================================================================
--- plugins/diemPlugin/trunk/dmCorePlugin/web/js/dmCoreConfig.js
2010-01-18 14:07:08 UTC (rev 26815)
+++ plugins/diemPlugin/trunk/dmCorePlugin/web/js/dmCoreConfig.js
2010-01-18 14:17:46 UTC (rev 26816)
@@ -8,12 +8,10 @@
dm_xhr: 1
}
},
- base : {
-
- }
+ base : {}
};
-// configuration de jQuery
+// jQuery
$.ajaxSetup({
global : false,
timeout : false,
@@ -22,12 +20,13 @@
data: $.dm.defaults.ajaxData
});
-//Configuration de jQuery UI
+// jQuery UI
if ($.datepicker)
{
- $.datepicker.regional[dm_configuration.culture];
+ $.datepicker.setDefaults($.datepicker.regional[dm_configuration.culture]);
}
+// jQuery plugins
if ($.blockUI)
{
$.blockUI.defaults = $.extend($.blockUI.defaults, {
Modified: plugins/diemPlugin/trunk/dmCorePlugin/web/js/dmCoreEditCtrl.js
===================================================================
--- plugins/diemPlugin/trunk/dmCorePlugin/web/js/dmCoreEditCtrl.js
2010-01-18 14:07:08 UTC (rev 26815)
+++ plugins/diemPlugin/trunk/dmCorePlugin/web/js/dmCoreEditCtrl.js
2010-01-18 14:17:46 UTC (rev 26816)
@@ -111,7 +111,7 @@
data = parts[0];
}
- $dialog.html(data).trigger('dmAjaxResponse');
+
$dialog.html(data).dmExtractEncodedAssets().trigger('dmAjaxResponse');
},
error: function(xhr)
{
Modified: plugins/diemPlugin/trunk/dmCorePlugin/web/js/dmCoreEditPlugins.js
===================================================================
--- plugins/diemPlugin/trunk/dmCorePlugin/web/js/dmCoreEditPlugins.js
2010-01-18 14:07:08 UTC (rev 26815)
+++ plugins/diemPlugin/trunk/dmCorePlugin/web/js/dmCoreEditPlugins.js
2010-01-18 14:17:46 UTC (rev 26816)
@@ -1,7 +1,12 @@
(function($)
{
- jQuery.fn.extend({
+ $.extend({
+ dmLoadedJavascripts: new Array(),
+ dmLoadedStylesheets: new Array()
+ });
+
+ $.fn.extend({
maxLength: function(max)
{
@@ -54,6 +59,57 @@
return this.ajaxForm($.extend({
data: $.dm.defaults.ajaxData
}, options));
+ },
+
+ // Detects javascripts and stylesheet inclusions and append them to the
document
+ dmExtractEncodedAssets: function()
+ {
+ if($encodedAssetsDiv = this.find('div.dm_encoded_assets').orNot())
+ {
+ json = $encodedAssetsDiv.html();
+ $encodedAssetsDiv.remove();
+
+ // Try to use the native JSON parser first
+ if ( window.JSON && window.JSON.parse )
+ {
+ data = window.JSON.parse( json );
+ }
+ else
+ {
+ data = (new Function("return " + json))();
+ }
+
+ for (i in data.css)
+ {
+ if (-1 == $.inArray(data.css[i], $.dmLoadedStylesheets))
+ {
+ $('head').append('<link rel="stylesheet" href="' + data.css[i] +
'" />');
+ $.dmLoadedStylesheets.push(data.css[i]);
+ }
+ }
+
+ for (var i in data.js)
+ {
+ if (-1 == $.inArray(data.js[i], $.dmLoadedJavascripts))
+ {
+ ajaxDefaultData = $.ajaxSettings.data;
+ $.ajaxSettings.data = null;
+
+ $.ajax({
+ url: data.js[i],
+ dataType: 'script',
+ cache: true,
+ async: false
+ });
+
+ $.ajaxSettings.data = ajaxDefaultData;
+
+ $.dmLoadedJavascripts.push(data.js[i]);
+ }
+ }
+ }
+
+ return this;
}
});
Modified: plugins/diemPlugin/trunk/dmCorePlugin/web/js/dmCorePageBar.js
===================================================================
--- plugins/diemPlugin/trunk/dmCorePlugin/web/js/dmCorePageBar.js
2010-01-18 14:07:08 UTC (rev 26815)
+++ plugins/diemPlugin/trunk/dmCorePlugin/web/js/dmCorePageBar.js
2010-01-18 14:17:46 UTC (rev 26816)
@@ -36,8 +36,8 @@
pageBar.element.addClass('loaded').block();
$.ajax({
- url: $.dm.ctrl.getHref('+/dmInterface/loadPageTree'),
- success: function(html)
+ url: $.dm.ctrl.getHref('+/dmInterface/loadPageTree'),
+ success: function(html)
{
$('#dm_page_tree').hide().html(html);
pageBar.refresh();
--
You received this message because you are subscribed to the Google Groups
"symfony SVN" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/symfony-svn?hl=en.
