Author: ornicar2
Date: 2010-02-02 17:21:55 +0100 (Tue, 02 Feb 2010)
New Revision: 27430
Removed:
plugins/diemPlugin/trunk/dmCorePlugin/web/js/dmCoreForm.js
Modified:
plugins/diemPlugin/trunk/dmAdminPlugin/data/generator/dmAdminDoctrineModule/dmAdmin/template/templates/editSuccess.php
plugins/diemPlugin/trunk/dmAdminPlugin/data/generator/dmAdminDoctrineModule/dmAdmin/template/templates/newSuccess.php
plugins/diemPlugin/trunk/dmAdminPlugin/web/js/dmAdminForm.js
plugins/diemPlugin/trunk/dmCorePlugin/config/dm/assets.yml
plugins/diemPlugin/trunk/dmCorePlugin/web/js/dmCoreEditPlugins.js
plugins/diemPlugin/trunk/dmFrontPlugin/lib/response/asset/dmFrontAssetConfig.php
plugins/diemPlugin/trunk/dmFrontPlugin/web/js/dmFrontForm.js
Log:
[Diem]
- extracted droppable input javascript behavior out of the form widget
- removed deprecated core.form asset
Modified:
plugins/diemPlugin/trunk/dmAdminPlugin/data/generator/dmAdminDoctrineModule/dmAdmin/template/templates/editSuccess.php
===================================================================
---
plugins/diemPlugin/trunk/dmAdminPlugin/data/generator/dmAdminDoctrineModule/dmAdmin/template/templates/editSuccess.php
2010-02-02 16:18:45 UTC (rev 27429)
+++
plugins/diemPlugin/trunk/dmAdminPlugin/data/generator/dmAdminDoctrineModule/dmAdmin/template/templates/editSuccess.php
2010-02-02 16:21:55 UTC (rev 27430)
@@ -1,7 +1,6 @@
[?php
use_helper('Date');
use_stylesheet('admin.form');
- use_javascript('core.form');
use_javascript('admin.form');
slot('dm.mini_search_form');
Modified:
plugins/diemPlugin/trunk/dmAdminPlugin/data/generator/dmAdminDoctrineModule/dmAdmin/template/templates/newSuccess.php
===================================================================
---
plugins/diemPlugin/trunk/dmAdminPlugin/data/generator/dmAdminDoctrineModule/dmAdmin/template/templates/newSuccess.php
2010-02-02 16:18:45 UTC (rev 27429)
+++
plugins/diemPlugin/trunk/dmAdminPlugin/data/generator/dmAdminDoctrineModule/dmAdmin/template/templates/newSuccess.php
2010-02-02 16:21:55 UTC (rev 27430)
@@ -1,7 +1,6 @@
[?php
use_helper('Date');
use_stylesheet('admin.form');
- use_javascript('core.form');
use_javascript('admin.form');
slot('dm.mini_search_form');
Modified: plugins/diemPlugin/trunk/dmAdminPlugin/web/js/dmAdminForm.js
===================================================================
--- plugins/diemPlugin/trunk/dmAdminPlugin/web/js/dmAdminForm.js
2010-02-02 16:18:45 UTC (rev 27429)
+++ plugins/diemPlugin/trunk/dmAdminPlugin/web/js/dmAdminForm.js
2010-02-02 16:21:55 UTC (rev 27430)
@@ -1,7 +1,7 @@
(function($)
{
- $.widget('ui.dmAdminForm', $.extend({}, $.dm.coreForm, {
+ $.widget('ui.dmAdminForm', {
_init: function()
{
@@ -11,9 +11,14 @@
this.markdown();
this.selectObject();
this.checkBoxList();
- this.linkDroppable();
+ this.droppableInput();
this.hotKeys();
},
+
+ droppableInput: function()
+ {
+ $('input.dm_link_droppable, .dm_link_droppable input',
this.element).dmDroppableInput();
+ },
focusFirstInput: function()
{
@@ -148,6 +153,6 @@
});
}
- }));
+ });
})(jQuery);
Modified: plugins/diemPlugin/trunk/dmCorePlugin/config/dm/assets.yml
===================================================================
--- plugins/diemPlugin/trunk/dmCorePlugin/config/dm/assets.yml 2010-02-02
16:18:45 UTC (rev 27429)
+++ plugins/diemPlugin/trunk/dmCorePlugin/config/dm/assets.yml 2010-02-02
16:21:55 UTC (rev 27430)
@@ -6,7 +6,6 @@
editPlugins: dmCoreEditPlugins
ctrl: dmCoreCtrl
editCtrl: dmCoreEditCtrl
- form: dmCoreForm
markdown: dmCoreMarkdown
tabForm: dmCoreTabForm
toolBar: dmCoreToolBar
Modified: plugins/diemPlugin/trunk/dmCorePlugin/web/js/dmCoreEditPlugins.js
===================================================================
--- plugins/diemPlugin/trunk/dmCorePlugin/web/js/dmCoreEditPlugins.js
2010-02-02 16:18:45 UTC (rev 27429)
+++ plugins/diemPlugin/trunk/dmCorePlugin/web/js/dmCoreEditPlugins.js
2010-02-02 16:21:55 UTC (rev 27430)
@@ -4,6 +4,45 @@
$.dm.loadedStylesheets = new Array();
$.fn.extend({
+
+ dmDroppableInput: function()
+ {
+ var $input = this;
+
+ if (!$input.hasClass('ui-droppable'))
+ {
+ if($input.hasClass('page_only'))
+ {
+ accept = '#dm_page_bar li';
+ }
+ else if($input.hasClass('media_only'))
+ {
+ accept = '#dm_media_bar li';
+ }
+ else
+ {
+ accept = '#dm_page_bar li, #dm_media_bar li.file';
+ }
+
+ $input.droppable({
+ accept: accept,
+ activeClass: 'droppable_active',
+ hoverClass: 'droppable_hover',
+ // tolerance: 'touch',
+ drop: function(e, ui)
+ {
+ if (ui.draggable.hasClass('file'))
+ {
+ $input.val('media:' + ui.draggable.attr('id').replace(/dmm/, '')
+ ' ' + ui.draggable.find('span.name:first').text().replace(/\s/g, ''));
+ }
+ else
+ {
+ $input.val('page:' + ui.draggable.attr('id').replace(/dmp/, '')
+ ' ' + ui.draggable.find('>a').text());
+ }
+ }
+ });
+ }
+ },
maxLength: function(max)
{
@@ -157,7 +196,8 @@
/*
* Make ui dialogs position: fixed
*/
- $(function() {
+ $(function()
+ {
if ($.ui.dialog)
{
$.ui.dialog.prototype._position = function(pos)
Deleted: plugins/diemPlugin/trunk/dmCorePlugin/web/js/dmCoreForm.js
===================================================================
--- plugins/diemPlugin/trunk/dmCorePlugin/web/js/dmCoreForm.js 2010-02-02
16:18:45 UTC (rev 27429)
+++ plugins/diemPlugin/trunk/dmCorePlugin/web/js/dmCoreForm.js 2010-02-02
16:21:55 UTC (rev 27430)
@@ -1,50 +0,0 @@
-(function($)
-{
- $.dm.coreForm = {
-
- linkDroppable: function()
- {
- var form = this;
-
- $('input.dm_link_droppable, .dm_link_droppable input',
form.element).each(function()
- {
- var $input = $(this);
-
- if (!$input.hasClass('ui-droppable'))
- {
- if( $input.hasClass('page_only'))
- {
- accept = '#dm_page_bar li';
- }
- else if( $input.hasClass('media_only'))
- {
- accept = '#dm_media_bar li';
- }
- else
- {
- accept = '#dm_page_bar li,
#dm_media_bar li.file';
- }
- $input.droppable({
- accept: accept,
- activeClass: 'droppable_active',
- hoverClass: 'droppable_hover',
- // tolerance:
'touch',
- drop: function(e, ui)
- {
- if
(ui.draggable.hasClass('file'))
- {
-
$input.val('media:' + ui.draggable.attr('id').replace(/dmm/, '') + ' ' +
ui.draggable.find('span.name:first').text().replace(/\s/g, ''));
- }
- else
- {
-
$input.val('page:' + ui.draggable.attr('id').replace(/dmp/, '') + ' ' +
ui.draggable.find('>a').text());
- }
- }
- });
- }
- });
- }
-
- };
-
-})(jQuery);
Modified:
plugins/diemPlugin/trunk/dmFrontPlugin/lib/response/asset/dmFrontAssetConfig.php
===================================================================
---
plugins/diemPlugin/trunk/dmFrontPlugin/lib/response/asset/dmFrontAssetConfig.php
2010-02-02 16:18:45 UTC (rev 27429)
+++
plugins/diemPlugin/trunk/dmFrontPlugin/lib/response/asset/dmFrontAssetConfig.php
2010-02-02 16:21:55 UTC (rev 27430)
@@ -60,7 +60,6 @@
'core.editPlugins',
'core.ctrl',
'core.editCtrl',
- 'core.form',
'core.toolBar',
'core.pageBar',
'core.mediaBar',
Modified: plugins/diemPlugin/trunk/dmFrontPlugin/web/js/dmFrontForm.js
===================================================================
--- plugins/diemPlugin/trunk/dmFrontPlugin/web/js/dmFrontForm.js
2010-02-02 16:18:45 UTC (rev 27429)
+++ plugins/diemPlugin/trunk/dmFrontPlugin/web/js/dmFrontForm.js
2010-02-02 16:21:55 UTC (rev 27430)
@@ -1,6 +1,6 @@
(function($) {
-$.widget('ui.dmFrontForm', $.extend({}, $.dm.coreForm, {
+$.widget('ui.dmFrontForm', {
_init : function()
{
@@ -9,12 +9,15 @@
this.form = $('form:first', this.element);
this.markdown();
-
- this.linkDroppable();
-
+ this.droppableInput();
this.hotKeys();
},
+ droppableInput: function()
+ {
+ $('input.dm_link_droppable, .dm_link_droppable input',
this.element).dmDroppableInput();
+ },
+
hotKeys: function()
{
var self = this;
@@ -35,6 +38,6 @@
});
}
-}));
+});
})(jQuery);
\ No newline at end of file
--
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.
