Author: ornicar2
Date: 2010-01-22 21:21:13 +0100 (Fri, 22 Jan 2010)
New Revision: 27068
Added:
plugins/diemPlugin/trunk/dmFrontPlugin/modules/dmZone/templates/_edit.php
plugins/diemPlugin/trunk/dmFrontPlugin/web/images/area_droppable.png
Removed:
plugins/diemPlugin/trunk/dmFrontPlugin/modules/dmZone/templates/editSuccess.php
Modified:
plugins/diemPlugin/trunk/dmCorePlugin/web/js/dmCorePlugins.js
plugins/diemPlugin/trunk/dmFrontPlugin/modules/dmCodeEditor/actions/actions.class.php
plugins/diemPlugin/trunk/dmFrontPlugin/modules/dmWidget/lib/BasedmWidgetActions.class.php
plugins/diemPlugin/trunk/dmFrontPlugin/modules/dmZone/actions/actions.class.php
plugins/diemPlugin/trunk/dmFrontPlugin/web/css/zone.css
plugins/diemPlugin/trunk/dmFrontPlugin/web/js/dmFrontForm.js
plugins/diemPlugin/trunk/dmFrontPlugin/web/js/page/dmWidget.js
plugins/diemPlugin/trunk/dmFrontPlugin/web/js/page/dmZone.js
Log:
[Diem]
- made zone actions use new async asset loading
- fixed hotkeys on zone dialog and widget dialog
- made hotkeys lib load asynchronously
- added mitjade's helper for droppable areas
Modified: plugins/diemPlugin/trunk/dmCorePlugin/web/js/dmCorePlugins.js
===================================================================
--- plugins/diemPlugin/trunk/dmCorePlugin/web/js/dmCorePlugins.js
2010-01-22 19:59:58 UTC (rev 27067)
+++ plugins/diemPlugin/trunk/dmCorePlugin/web/js/dmCorePlugins.js
2010-01-22 20:21:13 UTC (rev 27068)
@@ -37,6 +37,11 @@
},
bindKey: function(key, fn)
{
+ if( !window.hotkeys)
+ {
+ return this;
+ }
+
return this.bind('keydown', key, function(e)
{
e.stopPropagation();
@@ -45,6 +50,11 @@
},
unbindKey: function(key)
{
+ if( !window.hotkeys)
+ {
+ return this;
+ }
+
return this.unbind('keydown', key);
}
});
Modified:
plugins/diemPlugin/trunk/dmFrontPlugin/modules/dmCodeEditor/actions/actions.class.php
===================================================================
---
plugins/diemPlugin/trunk/dmFrontPlugin/modules/dmCodeEditor/actions/actions.class.php
2010-01-22 19:59:58 UTC (rev 27067)
+++
plugins/diemPlugin/trunk/dmFrontPlugin/modules/dmCodeEditor/actions/actions.class.php
2010-01-22 20:21:13 UTC (rev 27068)
@@ -9,7 +9,7 @@
return $this->renderAsync(array(
'html' => $this->getPartial('dmCodeEditor/launch'),
- 'js' => array('lib.ui-tabs', 'core.codeArea', 'front.codeEditor'),
+ 'js' => array('lib.ui-tabs', 'lib.hotkeys', 'core.codeArea',
'front.codeEditor'),
'css' => array('lib.ui-tabs', 'front.codeEditor')
), true);
}
Modified:
plugins/diemPlugin/trunk/dmFrontPlugin/modules/dmWidget/lib/BasedmWidgetActions.class.php
===================================================================
---
plugins/diemPlugin/trunk/dmFrontPlugin/modules/dmWidget/lib/BasedmWidgetActions.class.php
2010-01-22 19:59:58 UTC (rev 27067)
+++
plugins/diemPlugin/trunk/dmFrontPlugin/modules/dmWidget/lib/BasedmWidgetActions.class.php
2010-01-22 20:21:13 UTC (rev 27068)
@@ -75,7 +75,7 @@
return $this->renderAsync(array(
'html' => $this->renderEdit($form, $widgetType),
- 'js' => $form->getJavascripts(),
+ 'js' => array_merge(array('lib.hotkeys'), $form->getJavascripts()),
'css' => $form->getStylesheets()
), true);
}
Modified:
plugins/diemPlugin/trunk/dmFrontPlugin/modules/dmZone/actions/actions.class.php
===================================================================
---
plugins/diemPlugin/trunk/dmFrontPlugin/modules/dmZone/actions/actions.class.php
2010-01-22 19:59:58 UTC (rev 27067)
+++
plugins/diemPlugin/trunk/dmFrontPlugin/modules/dmZone/actions/actions.class.php
2010-01-22 20:21:13 UTC (rev 27068)
@@ -24,6 +24,11 @@
return $this->renderText('ok');
}
}
+
+ return $this->renderAsync(array(
+ 'html' => $this->getPartial('dmZone/edit'),
+ 'js' => array('lib.hotkeys')
+ ), true);
}
public function executeGetAttributes(sfWebRequest $request)
Copied:
plugins/diemPlugin/trunk/dmFrontPlugin/modules/dmZone/templates/_edit.php (from
rev 27036,
plugins/diemPlugin/trunk/dmFrontPlugin/modules/dmZone/templates/editSuccess.php)
===================================================================
--- plugins/diemPlugin/trunk/dmFrontPlugin/modules/dmZone/templates/_edit.php
(rev 0)
+++ plugins/diemPlugin/trunk/dmFrontPlugin/modules/dmZone/templates/_edit.php
2010-01-22 20:21:13 UTC (rev 27068)
@@ -0,0 +1,7 @@
+<?php
+
+echo £o('div.dm.dm_zone_edit');
+
+echo £('div.form', $form->render('.dm_form.list.little'));
+
+echo £c('div');
\ No newline at end of file
Deleted:
plugins/diemPlugin/trunk/dmFrontPlugin/modules/dmZone/templates/editSuccess.php
===================================================================
---
plugins/diemPlugin/trunk/dmFrontPlugin/modules/dmZone/templates/editSuccess.php
2010-01-22 19:59:58 UTC (rev 27067)
+++
plugins/diemPlugin/trunk/dmFrontPlugin/modules/dmZone/templates/editSuccess.php
2010-01-22 20:21:13 UTC (rev 27068)
@@ -1,7 +0,0 @@
-<?php
-
-echo £o('div.dm.dm_zone_edit');
-
-echo £('div.form', $form->render('.dm_form.list.little'));
-
-echo £c('div');
\ No newline at end of file
Modified: plugins/diemPlugin/trunk/dmFrontPlugin/web/css/zone.css
===================================================================
--- plugins/diemPlugin/trunk/dmFrontPlugin/web/css/zone.css 2010-01-22
19:59:58 UTC (rev 27067)
+++ plugins/diemPlugin/trunk/dmFrontPlugin/web/css/zone.css 2010-01-22
20:21:13 UTC (rev 27068)
@@ -38,6 +38,7 @@
opacity: 0.5;
}
-.dm_zone_helper {
-
+#dm_page.edit .dm_zones.droppable-active {
+ background: url(../images/area_droppable.png) top left no-repeat;
+ min-height: 100px;
}
\ No newline at end of file
Added: plugins/diemPlugin/trunk/dmFrontPlugin/web/images/area_droppable.png
===================================================================
(Binary files differ)
Property changes on:
plugins/diemPlugin/trunk/dmFrontPlugin/web/images/area_droppable.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: plugins/diemPlugin/trunk/dmFrontPlugin/web/js/dmFrontForm.js
===================================================================
--- plugins/diemPlugin/trunk/dmFrontPlugin/web/js/dmFrontForm.js
2010-01-22 19:59:58 UTC (rev 27067)
+++ plugins/diemPlugin/trunk/dmFrontPlugin/web/js/dmFrontForm.js
2010-01-22 20:21:13 UTC (rev 27068)
@@ -11,7 +11,19 @@
this.markdown();
this.linkDroppable();
+
+ this.hotKeys();
},
+
+ hotKeys: function()
+ {
+ var self = this;
+
+ self.element.bindKey('Ctrl+s', function() {
+ self.form.submit();
+ return false;
+ });
+ },
markdown: function()
{
Modified: plugins/diemPlugin/trunk/dmFrontPlugin/web/js/page/dmWidget.js
===================================================================
--- plugins/diemPlugin/trunk/dmFrontPlugin/web/js/page/dmWidget.js
2010-01-22 19:59:58 UTC (rev 27067)
+++ plugins/diemPlugin/trunk/dmFrontPlugin/web/js/page/dmWidget.js
2010-01-22 20:21:13 UTC (rev 27068)
@@ -33,102 +33,105 @@
}
}).bind('dmAjaxResponse', function() {
$dialog.prepare();
+
+ $('a.delete', $dialog).click(function() {
+ if (confirm($(this).attr('title')+" ?")) {
+ widget._delete();
+ $dialog.dialog('close');
+ }
+ });
+
var $form = $('div.dm_widget_edit', $dialog);
- if ($form.length)
+ if (!$form.length)
{
- /*
- *Move cut & copy actions to the title
- */
- if ($cutCopy = $form.find('div.dm_cut_copy_actions').orNot())
- {
- $dialog.parent().find('div.ui-dialog-titlebar').append($cutCopy);
- $cutCopy.find('a').click(function() {
- $.ajax({
- url: $(this).attr('href'),
- success: function()
- {
- $('#dm_tool_bar').dmFrontToolBar('reloadAddMenu');
- }
- });
+ return;
+ }
+
+ /*
+ *Move cut & copy actions to the title
+ */
+ if ($cutCopy = $form.find('div.dm_cut_copy_actions').orNot())
+ {
+ $dialog.parent().find('div.ui-dialog-titlebar').append($cutCopy);
+ $cutCopy.find('a').click(function() {
+ $.ajax({
+ url: $(this).attr('href'),
+ success: function()
+ {
+ $('#dm_tool_bar').dmFrontToolBar('reloadAddMenu');
+ }
+ });
- return false;
+ return false;
+ });
+ }
+ /*
+ * Apply generic front form abilities
+ */
+ $form.dmFrontForm();
+ /*
+ * Apply specific widget form abilities
+ */
+ if ((formClass = $form.metadata().form_class) &&
$.isFunction($form[formClass]))
+ {
+ $form[formClass](widget);
+ }
+ /*
+ * Restore active tab
+ */
+ if(activeTab)
+ {
+ $form.find('div.dm_tabbed_form').tabs('select', activeTab);
+ }
+ /*
+ * Enable code editor link
+ */
+ $form.find('a.code_editor').each(function() {
+ var $this = $(this).click(function() {
+ $('#dm_tool_bar').dmFrontToolBar('openCodeEditor',
function($codeEditor)
+ {
+ $codeEditor.find('#dm_code_editor_file_open
a[href='+$this.attr('href')+']').trigger('click');
});
- }
- /*
- * Apply generic front form abilities
- */
- $form.dmFrontForm();
- /*
- * Apply specific widget form abilities
- */
- if ((formClass = $form.metadata().form_class) &&
$.isFunction($form[formClass]))
- {
- $form[formClass](widget);
- }
- /*
- * Restore active tab
- */
- if(activeTab)
+ });
+ });
+ /*
+ * Tell the server the form is submitted with an xhr request
+ * ( usefull when uploading files )
+ */
+ $form.find('form').dmAjaxForm({
+ beforeSubmit: function(data) {
+ $dialog.block();
+ if ($tabbedFormActiveTab = $form.find('ul.ui-tabs-nav >
li.ui-tabs-selected:first').orNot())
+ {
+ activeTab = $tabbedFormActiveTab.find('>a').attr('href');
+ }
+ },
+ error: function(xhr, textStatus, errorThrown)
{
- $form.find('div.dm_tabbed_form').tabs('select', activeTab);
- }
- /*
- * Enable code editor link
- */
- $form.find('a.code_editor').each(function() {
- var $this = $(this).click(function() {
-
$('#dm_tool_bar').dmFrontToolBar('openCodeEditor', function($codeEditor)
- {
-
$codeEditor.find('#dm_code_editor_file_open
a[href='+$this.attr('href')+']').trigger('click');
- });
- });
- });
- /*
- * Tell the server the form is submitted with
an xhr request
- * ( usefull when uploading files )
- */
- $form.find('form').dmAjaxForm({
- beforeSubmit: function(data) {
- $dialog.block();
- if ($tabbedFormActiveTab =
$form.find('ul.ui-tabs-nav > li.ui-tabs-selected:first').orNot())
- {
- activeTab =
$tabbedFormActiveTab.find('>a').attr('href');
- }
- },
- error: function(xhr, textStatus,
errorThrown)
- {
- $dialog.unblock();
- widget.element.unblock();
- $.dm.ctrl.errorDialog('Error
when updating the widget', xhr.responseText);
- },
- success: function(data)
- {
- if('saved' == data)
- {
- $dialog.dialog('close');
- return;
- }
-
- parts = data.split(/\_\_DM\_SPLIT\_\_/);
+ $dialog.unblock();
+ widget.element.unblock();
+ $.dm.ctrl.errorDialog('Error when updating the widget',
xhr.responseText);
+ },
+ success: function(data)
+ {
+ if('saved' == data)
+ {
+ $dialog.dialog('close');
+ return;
+ }
- // update widget content
- if(parts[1])
- {
- widget.replace(parts[1]);
- }
-
- $form.trigger('submitSuccess');
+ parts = data.split(/\_\_DM\_SPLIT\_\_/);
- // update dialog content
- $dialog.html(parts[0]).trigger('dmAjaxResponse');
- }
- });
- }
-
- $('a.delete', $dialog).click(function() {
- if (confirm($(this).attr('title')+" ?")) {
- widget._delete();
- $dialog.dialog('close');
+ // update widget content
+ if(parts[1])
+ {
+ widget.replace(parts[1]);
+ }
+
+ $form.trigger('submitSuccess');
+
+ // update dialog content
+ $dialog.html(parts[0]).trigger('dmAjaxResponse');
}
});
});
Modified: plugins/diemPlugin/trunk/dmFrontPlugin/web/js/page/dmZone.js
===================================================================
--- plugins/diemPlugin/trunk/dmFrontPlugin/web/js/page/dmZone.js
2010-01-22 19:59:58 UTC (rev 27067)
+++ plugins/diemPlugin/trunk/dmFrontPlugin/web/js/page/dmZone.js
2010-01-22 20:21:13 UTC (rev 27068)
@@ -68,17 +68,18 @@
$dialog.block();
zone.element.block();
},
- success: function(data) {
- if (data == 'ok') {
+ success: function(html) {
+ if (html == 'ok') {
$dialog.dialog('close');
}
- $dialog.html(data).trigger('dmAjaxResponse');
+ $dialog.html(html).trigger('dmAjaxResponse');
if(!$('ul.error_list', $form).length) {
zone.element.attr('class', 'dm_zone '+
$('input.dm_zone_css_class', $form).val().replace(/\./g, ' ')).css('width',
$('input.dm_zone_width', $form).val());
}
zone.element.unblock();
}
});
+
$('a.delete', $form).click(function() {
if (confirm($(this).attr('title')+" ?")) {
zone._delete();
--
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.
