Author: ornicar2
Date: 2010-01-23 02:20:20 +0100 (Sat, 23 Jan 2010)
New Revision: 27081
Modified:
plugins/diemPlugin/trunk/dmAdminPlugin/web/js/dmAdminAutoSeo.js
plugins/diemPlugin/trunk/dmAdminPlugin/web/js/dmAdminChart.js
plugins/diemPlugin/trunk/dmAdminPlugin/web/js/dmAdminCodeEditor.js
plugins/diemPlugin/trunk/dmAdminPlugin/web/js/dmAdminConfigPanel.js
plugins/diemPlugin/trunk/dmAdminPlugin/web/js/dmAdminConsole.js
plugins/diemPlugin/trunk/dmAdminPlugin/web/js/dmAdminCtrl.js
plugins/diemPlugin/trunk/dmAdminPlugin/web/js/dmAdminGalleryCtrl.js
plugins/diemPlugin/trunk/dmAdminPlugin/web/js/dmAdminHistoryCtrl.js
plugins/diemPlugin/trunk/dmAdminPlugin/web/js/dmAdminLog.js
plugins/diemPlugin/trunk/dmAdminPlugin/web/js/dmAdminLogs.js
plugins/diemPlugin/trunk/dmAdminPlugin/web/js/dmAdminManualSeo.js
plugins/diemPlugin/trunk/dmAdminPlugin/web/js/dmAdminMediaCtrl.js
plugins/diemPlugin/trunk/dmAdminPlugin/web/js/dmAdminSitemap.js
plugins/diemPlugin/trunk/dmAdminPlugin/web/js/dmAdminSortCtrl.js
plugins/diemPlugin/trunk/dmCorePlugin/web/js/dmCoreCtrl.js
plugins/diemPlugin/trunk/dmFrontPlugin/web/js/dmFrontCtrl.js
plugins/diemPlugin/trunk/dmFrontPlugin/web/js/dmFrontEditCtrl.js
Log:
[Diem]
- simplified and refactored the javascript codebase
Modified: plugins/diemPlugin/trunk/dmAdminPlugin/web/js/dmAdminAutoSeo.js
===================================================================
--- plugins/diemPlugin/trunk/dmAdminPlugin/web/js/dmAdminAutoSeo.js
2010-01-23 00:09:14 UTC (rev 27080)
+++ plugins/diemPlugin/trunk/dmAdminPlugin/web/js/dmAdminAutoSeo.js
2010-01-23 01:20:20 UTC (rev 27081)
@@ -1,40 +1,25 @@
(function($)
{
- $.dm.ctrl.add({
-
- init: function()
- {
- this.metaPreview();
+var $autoSeo = $('#dm_admin_content div.dm_auto_seo'), $form =
$autoSeo.find('form');
+
+$autoSeo.find('li.dm_meta_preview').each(function(index)
+{
+ $(this).height($('li.dm_form_element:eq('+index+')', $form).height());
+});
- this.variables();
-
- $('li.ui-state-default', this.$dom).hover(function() {
- $(this).addClass('ui-state-hover');
- },function() {
- $(this).removeClass('ui-state-hover');
- });
- },
+$autoSeo.find('li.ui-state-default').hover(function()
+{
+ $(this).addClass('ui-state-hover');
+},
+function()
+{
+ $(this).removeClass('ui-state-hover');
+});
- metaPreview: function()
- {
- var $form = $('form', this.$dom);
-
- $('li.dm_meta_preview', this.$dom).each(function(index) {
-
$(this).height($('li.dm_form_element:eq('+index+')', $form).height());
- });
- },
-
- variables: function()
- {
- var $variables = $('div.dm_variables', this.$dom);
-
- $variables.find('>ul').accordion({
- collapsible: true,
- active: false,
- });
- }
-
- });
+$autoSeo.find('div.dm_variables >ul').accordion({
+ collapsible: true,
+ active: false
+});
})(jQuery);
\ No newline at end of file
Modified: plugins/diemPlugin/trunk/dmAdminPlugin/web/js/dmAdminChart.js
===================================================================
--- plugins/diemPlugin/trunk/dmAdminPlugin/web/js/dmAdminChart.js
2010-01-23 00:09:14 UTC (rev 27080)
+++ plugins/diemPlugin/trunk/dmAdminPlugin/web/js/dmAdminChart.js
2010-01-23 01:20:20 UTC (rev 27081)
@@ -1,23 +1,18 @@
(function($)
{
- $.dm.ctrl.add({
-
- init: function()
- {
- var $tabs = $('div.dm_charts', this.$dom);
-
- $tabs.tabs($.extend({
- cache: true,
- select: function() {
- $tabs.block();
- },
- show: function() {
- $tabs.unblock();
- }
- }, $tabs.metadata()));
- }
-
- });
+var $tabs = $('div.dm_charts');
+
+$tabs.tabs($.extend({
+ cache: true,
+ select: function()
+ {
+ $tabs.block();
+ },
+ show: function()
+ {
+ $tabs.unblock();
+ }
+}, $tabs.metadata()));
})(jQuery);
\ No newline at end of file
Modified: plugins/diemPlugin/trunk/dmAdminPlugin/web/js/dmAdminCodeEditor.js
===================================================================
--- plugins/diemPlugin/trunk/dmAdminPlugin/web/js/dmAdminCodeEditor.js
2010-01-23 00:09:14 UTC (rev 27080)
+++ plugins/diemPlugin/trunk/dmAdminPlugin/web/js/dmAdminCodeEditor.js
2010-01-23 01:20:20 UTC (rev 27081)
@@ -1,6 +1,6 @@
(function($)
{
-
+$(function() {
$.dm.codeEditor = {
init: function()
@@ -491,7 +491,7 @@
$.tree_reference('dm_code_editor_tree').refresh();
}
}
- },
+ }
}
});
},
@@ -554,6 +554,6 @@
};
- $.dm.ctrl.add($.dm.codeEditor);
-
+ $.dm.codeEditor.init();
+});
})(jQuery);
\ No newline at end of file
Modified: plugins/diemPlugin/trunk/dmAdminPlugin/web/js/dmAdminConfigPanel.js
===================================================================
--- plugins/diemPlugin/trunk/dmAdminPlugin/web/js/dmAdminConfigPanel.js
2010-01-23 00:09:14 UTC (rev 27080)
+++ plugins/diemPlugin/trunk/dmAdminPlugin/web/js/dmAdminConfigPanel.js
2010-01-23 01:20:20 UTC (rev 27081)
@@ -1,13 +1,6 @@
(function($)
{
- $.dm.ctrl.add({
-
- init: function()
- {
- $('div.dm_config_panel').dmCoreTabForm({});
- }
-
- });
-
+$('div.dm_config_panel').dmCoreTabForm({});
+
})(jQuery);
Modified: plugins/diemPlugin/trunk/dmAdminPlugin/web/js/dmAdminConsole.js
===================================================================
--- plugins/diemPlugin/trunk/dmAdminPlugin/web/js/dmAdminConsole.js
2010-01-23 00:09:14 UTC (rev 27080)
+++ plugins/diemPlugin/trunk/dmAdminPlugin/web/js/dmAdminConsole.js
2010-01-23 01:20:20 UTC (rev 27081)
@@ -1,48 +1,44 @@
(function($) {
-$.dm.console = {
+var
+$console = $("#dm_console"),
+$command = $("#dm_command"),
+$lines = $console.find(".dm_content_command"),
+$wait = $console.find(".dm_console_wait");
- init : function()
+scroll();
+
+$lines.bind("click", function()
+{
+ $command.focus();
+}).trigger("click");
+
+$("#dm_command_wrap form").ajaxForm({
+ beforeSubmit: function(data)
{
- this.$ = $("#dm_console");
+ if ($("#dm_command").val() == "") return false;
+
+ if($("#dm_command").val() == "clear")
+ {
+ $lines.html('<li> </li>');
+ $("#dm_command").val("");
+ return false;
+ }
- var $command = $("#dm_command"),
- $lines = $(".dm_content_command", this.$),
- $wait = $(".dm_console_wait")
- self = this;
-
- this.scroll();
-
- $lines.bind("click", function()
- {
- $command.focus();
- }).trigger("click");
-
- $("#dm_command_wrap form").ajaxForm({
- beforeSubmit: function(data) {
- if ($("#dm_command").val() == "") return false;
-
- if($("#dm_command").val() == "clear")
- {
- $lines.html('<li> </li>');
- $("#dm_command").val("");
- return false;
- }
- $("#dm_command").val("Loading...");
- },
- success: function(data) {
- $lines.append(data);
- $.dm.console.scroll();
- $("#dm_command").val("");
- }
- });
+ $("#dm_command").val("Loading...");
+ return true;
},
- scroll : function()
+ success: function(data)
{
- this.$[0].scrollTop = 16*$("li", this.$).length;
+ $lines.append(data);
+ scroll();
+ $("#dm_command").val("");
}
-};
+});
-$.dm.ctrl.add($.dm.console);
+function scroll()
+{
+ $console[0].scrollTop = 16*$console.find("li").length;
+}
})(jQuery);
Modified: plugins/diemPlugin/trunk/dmAdminPlugin/web/js/dmAdminCtrl.js
===================================================================
--- plugins/diemPlugin/trunk/dmAdminPlugin/web/js/dmAdminCtrl.js
2010-01-23 00:09:14 UTC (rev 27080)
+++ plugins/diemPlugin/trunk/dmAdminPlugin/web/js/dmAdminCtrl.js
2010-01-23 01:20:20 UTC (rev 27081)
@@ -7,8 +7,6 @@
{
this.$ = $("#dm_admin_content");
- this.launchControllers(this.$);
-
this.fullHeight();
this.bars();
Modified: plugins/diemPlugin/trunk/dmAdminPlugin/web/js/dmAdminGalleryCtrl.js
===================================================================
--- plugins/diemPlugin/trunk/dmAdminPlugin/web/js/dmAdminGalleryCtrl.js
2010-01-23 00:09:14 UTC (rev 27080)
+++ plugins/diemPlugin/trunk/dmAdminPlugin/web/js/dmAdminGalleryCtrl.js
2010-01-23 01:20:20 UTC (rev 27081)
@@ -1,51 +1,29 @@
(function($) {
-
-$.dm.galleryCtrl = {
- init: function()
- {
- this.$ = $("div.dm_gallery_big");
+var $gallery = $("div.dm_gallery_big"), $list = $gallery.find('ul.list'),
metadata = $gallery.metadata();
- this.metadata = this.$.metadata();
-
- this.form();
-
- this.sort();
- },
+$gallery.find('a.open_form').click(function()
+{
+ $gallery.find('form.dm_add_media').toggle();
+});
- form: function()
- {
- var self = this;
-
- self.$.find('a.open_form').click(function() {
- self.$.find('form.dm_add_media').toggle();
- });
- },
-
- sort: function()
- {
- var self = this, $list = self.$.find('ul.list');
-
- $list.sortable({
- tolerance: 'pointer',
- opacity: 0.5,
- placeholder: 'ui-state-highlight',
- revert: true,
- scroll: true,
- distance: 10,
- start: function(e, ui) {
- ui.placeholder.html(ui.item.html());
- },
- stop: function() {
- $.ajax({
- url:
$.dm.ctrl.getHref('+/dmMedia/sortGallery?model='+self.metadata.model+'&pk='+self.metadata.pk+'&'+$list.sortable('serialize'))
- });
- }
- });
- }
+$list.sortable({
+ tolerance: 'pointer',
+ opacity: 0.5,
+ placeholder: 'ui-state-highlight',
+ revert: true,
+ scroll: true,
+ distance: 10,
+ start: function(e, ui)
+ {
+ ui.placeholder.html(ui.item.html());
+ },
+ stop: function()
+ {
+ $.ajax({
+ url:
$.dm.ctrl.getHref('+/dmMedia/sortGallery?model='+metadata.model+'&pk='+metadata.pk+'&'+$list.sortable('serialize'))
+ });
+ }
+});
-};
-
-$.dm.ctrl.add($.dm.galleryCtrl);
-
})(jQuery);
\ No newline at end of file
Modified: plugins/diemPlugin/trunk/dmAdminPlugin/web/js/dmAdminHistoryCtrl.js
===================================================================
--- plugins/diemPlugin/trunk/dmAdminPlugin/web/js/dmAdminHistoryCtrl.js
2010-01-23 00:09:14 UTC (rev 27080)
+++ plugins/diemPlugin/trunk/dmAdminPlugin/web/js/dmAdminHistoryCtrl.js
2010-01-23 01:20:20 UTC (rev 27081)
@@ -1,26 +1,5 @@
(function($) {
-$.dm.historyCtrl = {
+$("div.dm_history").tabs();
- init: function()
- {
- this.$ = $("div.dm_history");
-
- this.metadata = this.$.metadata();
-
- this.tabs();
- },
-
- tabs: function()
- {
- var self = this;
-
- self.$.tabs({
-
- });
- }
-};
-
-$.dm.ctrl.add($.dm.historyCtrl);
-
})(jQuery);
\ No newline at end of file
Modified: plugins/diemPlugin/trunk/dmAdminPlugin/web/js/dmAdminLog.js
===================================================================
--- plugins/diemPlugin/trunk/dmAdminPlugin/web/js/dmAdminLog.js 2010-01-23
00:09:14 UTC (rev 27080)
+++ plugins/diemPlugin/trunk/dmAdminPlugin/web/js/dmAdminLog.js 2010-01-23
01:20:20 UTC (rev 27081)
@@ -1,23 +1,18 @@
(function($)
{
- $.dm.ctrl.add({
-
- init: function()
- {
- var $tabs = $('div.dm_logs', this.$dom);
-
- $tabs.tabs($.extend({
- cache: true,
- select: function() {
- $tabs.block();
- },
- show: function() {
- $tabs.unblock();
- }
- }, $tabs.metadata())).block();
- }
-
- });
+var $tabs = $('div.dm_logs', this.$dom);
+
+$tabs.tabs($.extend({
+ cache: true,
+ select: function()
+ {
+ $tabs.block();
+ },
+ show: function()
+ {
+ $tabs.unblock();
+ }
+}, $tabs.metadata())).block();
})(jQuery);
\ No newline at end of file
Modified: plugins/diemPlugin/trunk/dmAdminPlugin/web/js/dmAdminLogs.js
===================================================================
--- plugins/diemPlugin/trunk/dmAdminPlugin/web/js/dmAdminLogs.js
2010-01-23 00:09:14 UTC (rev 27080)
+++ plugins/diemPlugin/trunk/dmAdminPlugin/web/js/dmAdminLogs.js
2010-01-23 01:20:20 UTC (rev 27081)
@@ -1,50 +1,50 @@
(function($) {
-$.dm.ctrl.add($.dm.adminLogs = {
-
- init: function()
- {
- $.each(['request', 'event'], function(){
- $.dm.adminLogs[this] = {
- hash: '',
- $wrapper: $('div.'+this+'_log')
- };
-
-
$.dm.adminLogs[this].$wrapper.find('div.dm_box_inner').height(200);
- });
-
- setTimeout($.dm.adminLogs.refresh, 300);
- },
-
- refresh: function()
- {
- $.ajax({
- dataType: 'json',
- url: $.dm.ctrl.getHref('+/dmLog/refresh'),
- data: {
- rh: $.dm.adminLogs.request.hash,
- eh: $.dm.adminLogs.event.hash,
- dm_nolog: 1
- },
- success: function(data) {
- $.each(['request', 'event'], function(){
- if (data[this])
- {
- var current = this;
- $.dm.adminLogs[current].$wrapper.find('div.dm_box_inner').block();
- setTimeout(function() {
-
$.dm.adminLogs[current].$wrapper.find('tbody').html(data[current].html).end().find('div.dm_box_inner').height('auto').unblock();
- $.dm.adminLogs[current].hash = data[current].hash;
- }, 200);
- }
- });
- setTimeout($.dm.adminLogs.refresh, 3000);
- },
- error: function() {
- setTimeout($.dm.adminLogs.refresh, 5000);
- }
- })
- }
+var logs = new Array();
+
+$.each(['request', 'event'], function()
+{
+ logs[this] = {
+ hash: '',
+ $wrapper: $('div.'+this+'_log')
+ };
+
+ logs[this].$wrapper.find('div.dm_box_inner').height(200);
});
+setTimeout(refresh, 300);
+
+function refresh()
+{
+ $.ajax({
+ dataType: 'json',
+ url: $.dm.ctrl.getHref('+/dmLog/refresh'),
+ data: {
+ rh: logs.request.hash,
+ eh: logs.event.hash,
+ dm_nolog: 1
+ },
+ success: function(data)
+ {
+ $.each(['request', 'event'], function()
+ {
+ if (data[this])
+ {
+ var current = this;
+ logs[current].$wrapper.find('div.dm_box_inner').block();
+ setTimeout(function() {
+
logs[current].$wrapper.find('tbody').html(data[current].html).end().find('div.dm_box_inner').height('auto').unblock();
+ logs[current].hash = data[current].hash;
+ }, 200);
+ }
+ });
+ setTimeout(refresh, 3000);
+ },
+ error: function()
+ {
+ setTimeout(refresh, 5000);
+ }
+ })
+}
+
})(jQuery);
\ No newline at end of file
Modified: plugins/diemPlugin/trunk/dmAdminPlugin/web/js/dmAdminManualSeo.js
===================================================================
--- plugins/diemPlugin/trunk/dmAdminPlugin/web/js/dmAdminManualSeo.js
2010-01-23 00:09:14 UTC (rev 27080)
+++ plugins/diemPlugin/trunk/dmAdminPlugin/web/js/dmAdminManualSeo.js
2010-01-23 01:20:20 UTC (rev 27081)
@@ -1,12 +1,4 @@
(function($)
{
-
- $.dm.ctrl.add({
-
- init: function()
- {
- }
-
- });
})(jQuery);
\ No newline at end of file
Modified: plugins/diemPlugin/trunk/dmAdminPlugin/web/js/dmAdminMediaCtrl.js
===================================================================
--- plugins/diemPlugin/trunk/dmAdminPlugin/web/js/dmAdminMediaCtrl.js
2010-01-23 00:09:14 UTC (rev 27080)
+++ plugins/diemPlugin/trunk/dmAdminPlugin/web/js/dmAdminMediaCtrl.js
2010-01-23 01:20:20 UTC (rev 27081)
@@ -1,86 +1,73 @@
(function($) {
-$.dm.mediaCtrl = {
+var $library = $("div.dm_media_library");
- init: function()
+$library.find('ul.content li.file a.link').bind('click', function()
+{
+ var $dialog = $.dm.ctrl.ajaxDialog({
+ url: $(this).attr("href"),
+ 'class': 'dm_media_library dm_media_file_dialog',
+ width: 700,
+ height: 420
+ }).bind('dmAjaxResponse', function()
{
- this.$ = $("div.dm_media_library");
-
- this.metadata = this.$.metadata();
-
- this.controls();
-
- this.content();
- },
-
- content: function()
- {
- var self = this,
- $content = $('ul.content', self.$);
-
- $('li.file a.link', $content).bind('click', function() {
- var $dialog = $.dm.ctrl.ajaxDialog({
- url: $(this).attr("href"),
- class: 'dm_media_library dm_media_file_dialog',
- width: 700,
- height: 420
- }).bind('dmAjaxResponse', function() {
- $dialog.prepare();
- $form_wrap = $('div.form', $dialog);
- $dialog.dialog('option', 'title', $('.title', $dialog).text());
- $("form", $dialog).dmAjaxForm({
- beforeSubmit: function() {
- $form_wrap.block();
- },
- success: function(data) {
- if (data.substr(0, 4) == '[OK]') {
- location.href = data.split('|')[1];
- } else {
- $form_wrap.unblock().html(data);
- $dialog.trigger('dmAjaxResponse');
- }
- }
- });
- });
- return false;
+ $dialog.prepare();
+ $formWrap = $('div.form', $dialog);
+ $dialog.dialog('option', 'title', $('.title', $dialog).text());
+ $("form", $dialog).dmAjaxForm({
+ beforeSubmit: function()
+ {
+ $formWrap.block();
+ },
+ success: function(data) {
+ if (data.substr(0, 4) == '[OK]')
+ {
+ location.href = data.split('|')[1];
+ }
+ else
+ {
+ $formWrap.unblock().html(data);
+ $dialog.trigger('dmAjaxResponse');
+ }
+ }
});
-
- if (this.metadata.open_media)
- {
- $('li.file.media_id_'+this.metadata.open_media+' a.link',
$content).trigger('click');
- }
- },
+ });
+ return false;
+});
- controls: function()
+$library.find("div.control a.dialog_me").bind('click', function()
+{
+ var $dialog = $.dm.ctrl.ajaxDialog({
+ modal: true,
+ title: $(this).html(),
+ url: $(this).attr("href"),
+ width: 380
+ }).bind('dmAjaxResponse', function()
{
- var self = this;
- $("div.control a.dialog_me", self.$).bind('click', function() {
- var $dialog = $.dm.ctrl.ajaxDialog({
- modal: true,
- title: $(this).html(),
- url: $(this).attr("href"),
- width: 380
- }).bind('dmAjaxResponse', function() {
- $dialog.prepare();
- $("form", $dialog).dmAjaxForm({
- beforeSubmit: function() {
- $dialog.block();
- },
- success: function(data) {
- if (data.substr(0, 4) == '[OK]') {
- location.href = data.split('|')[1];
- } else {
- $dialog.unblock().html(data).trigger('dmAjaxResponse');
- }
- }
- });
- });
- return false;
+ $dialog.prepare();
+ $("form", $dialog).dmAjaxForm({
+ beforeSubmit: function() {
+ $dialog.block();
+ },
+ success: function(data) {
+ if (data.substr(0, 4) == '[OK]')
+ {
+ location.href = data.split('|')[1];
+ }
+ else
+ {
+ $dialog.unblock().html(data).trigger('dmAjaxResponse');
+ }
+ }
});
- }
+ });
-};
+ return false;
+});
-$.dm.ctrl.add($.dm.mediaCtrl);
+if ($library.metadata().open_media)
+{
+ $('li.file.media_id_'+$library.metadata().open_media+' a.link',
$content).trigger('click');
+}
})(jQuery);
\ No newline at end of file
Modified: plugins/diemPlugin/trunk/dmAdminPlugin/web/js/dmAdminSitemap.js
===================================================================
--- plugins/diemPlugin/trunk/dmAdminPlugin/web/js/dmAdminSitemap.js
2010-01-23 00:09:14 UTC (rev 27080)
+++ plugins/diemPlugin/trunk/dmAdminPlugin/web/js/dmAdminSitemap.js
2010-01-23 01:20:20 UTC (rev 27081)
@@ -1,17 +1,11 @@
(function($)
{
- $.dm.ctrl.add({
+$('div.dm_sitemap_tabs').tabs({});
- init: function()
- {
- $('div.dm_sitemap_tabs').tabs({});
+$('input.dm_sitemap_generate').click(function()
+{
+ $('form.dm_sitemap_generate_form').submit();
+});
- $('input.dm_sitemap_generate').click(function() {
- $('form.dm_sitemap_generate_form').submit();
- });
- }
-
- });
-
})(jQuery);
\ No newline at end of file
Modified: plugins/diemPlugin/trunk/dmAdminPlugin/web/js/dmAdminSortCtrl.js
===================================================================
--- plugins/diemPlugin/trunk/dmAdminPlugin/web/js/dmAdminSortCtrl.js
2010-01-23 00:09:14 UTC (rev 27080)
+++ plugins/diemPlugin/trunk/dmAdminPlugin/web/js/dmAdminSortCtrl.js
2010-01-23 01:20:20 UTC (rev 27081)
@@ -1,33 +1,21 @@
(function($) {
-$.dm.ctrl.add({
-
- init: function()
+$('div.dm_sort ol.objects').sortable({
+ opacity: 0.5,
+ placeholder: 'ui-state-highlight',
+ revert: true,
+ scroll: true,
+ beforeStop: function(e, ui, o)
{
- var self = this;
-
- self.$ = $("div.dm_sort");
-
- self.metadata = self.$.metadata();
-
- $('ol.objects', self.$).sortable({
- opacity: 0.5,
- placeholder: 'ui-state-highlight',
- revert: true,
- scroll: true,
- beforeStop: function(e, ui, o) {
- $('li.object.active', $(this)).removeClass('active');
- ui.helper.addClass('active');
- },
- stop: function(event, ui) {
- $('li.object', $(this)).each(function(index) {
- $('>input', $(this)).val(index+1);
- });
- }
+ $('li.object.active', $(this)).removeClass('active');
+ ui.helper.addClass('active');
+ },
+ stop: function(event, ui)
+ {
+ $('li.object', $(this)).each(function(index) {
+ $('>input', $(this)).val(index+1);
});
-
}
-
});
})(jQuery);
\ No newline at end of file
Modified: plugins/diemPlugin/trunk/dmCorePlugin/web/js/dmCoreCtrl.js
===================================================================
--- plugins/diemPlugin/trunk/dmCorePlugin/web/js/dmCoreCtrl.js 2010-01-23
00:09:14 UTC (rev 27080)
+++ plugins/diemPlugin/trunk/dmCorePlugin/web/js/dmCoreCtrl.js 2010-01-23
01:20:20 UTC (rev 27081)
@@ -2,28 +2,12 @@
{
$.dm.coreCtrl = {
-
- controllers: [],
- add: function(ctrl)
- {
- this.controllers.push(ctrl);
- },
-
- launchControllers: function($dom)
- {
- for (var i in this.controllers)
- {
- this.controllers[i].$dom = $dom;
- this.controllers[i].options = this.options;
- this.controllers[i].init();
- }
- },
-
getHref: function(action)
{
return this.options.script_name + action;
}
+
};
$(function()
Modified: plugins/diemPlugin/trunk/dmFrontPlugin/web/js/dmFrontCtrl.js
===================================================================
--- plugins/diemPlugin/trunk/dmFrontPlugin/web/js/dmFrontCtrl.js
2010-01-23 00:09:14 UTC (rev 27080)
+++ plugins/diemPlugin/trunk/dmFrontPlugin/web/js/dmFrontCtrl.js
2010-01-23 01:20:20 UTC (rev 27081)
@@ -5,11 +5,7 @@
init: function()
{
- var $page = $('#dm_page');
-
- this.launchControllers($page);
-
- $page.find('div.dm_widget').trigger('dmWidgetLaunch');
+ $('#dm_page div.dm_widget').trigger('dmWidgetLaunch');
}
});
Modified: plugins/diemPlugin/trunk/dmFrontPlugin/web/js/dmFrontEditCtrl.js
===================================================================
--- plugins/diemPlugin/trunk/dmFrontPlugin/web/js/dmFrontEditCtrl.js
2010-01-23 00:09:14 UTC (rev 27080)
+++ plugins/diemPlugin/trunk/dmFrontPlugin/web/js/dmFrontEditCtrl.js
2010-01-23 01:20:20 UTC (rev 27081)
@@ -5,27 +5,18 @@
init: function()
{
- var $page = $('#dm_page').dmPage();
-
- this.launchControllers($page);
-
- $page.find('div.dm_widget').trigger('dmWidgetLaunch');
+ $('#dm_page').dmPage().find('div.dm_widget').trigger('dmWidgetLaunch');
- this.bars();
-
- this.liveEvents();
- },
-
- bars: function()
- {
$('#dm_page_bar').dmFrontPageBar();
-
- if ($mediaBar = $('#dm_media_bar').orNot())
+
+ if ($mediaBar = $('#dm_media_bar').orNot())
{
$mediaBar.dmFrontMediaBar();
}
-
+
$('#dm_tool_bar').dmFrontToolBar();
+
+ this.liveEvents();
}
});
--
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.
