Author: ornicar2
Date: 2010-01-18 14:47:38 +0100 (Mon, 18 Jan 2010)
New Revision: 26814
Modified:
plugins/dmWidgetGalleryPlugin/
plugins/dmWidgetGalleryPlugin/lib/dmWidgetContentGalleryForm.php
plugins/dmWidgetGalleryPlugin/lib/dmWidgetContentGalleryView.php
plugins/dmWidgetGalleryPlugin/web/js/form.js
plugins/dmWidgetGalleryPlugin/web/js/view.js
Log:
[Diem][dmWidgetGalleryPlugin]
- enhanced asynchronous assets inclusion
- fixed delete icon path
- made gallery run on dmWidgetLaunch event
Property changes on: plugins/dmWidgetGalleryPlugin
___________________________________________________________________
Added: svn:ignore
+ .settings
.project
.buildpath
nbproject
project.*
Modified: plugins/dmWidgetGalleryPlugin/lib/dmWidgetContentGalleryForm.php
===================================================================
--- plugins/dmWidgetGalleryPlugin/lib/dmWidgetContentGalleryForm.php
2010-01-18 13:46:29 UTC (rev 26813)
+++ plugins/dmWidgetGalleryPlugin/lib/dmWidgetContentGalleryForm.php
2010-01-18 13:47:38 UTC (rev 26814)
@@ -15,16 +15,6 @@
public function configure()
{
- $this->addRequiredStylesheet(array(
- 'lib.ui-tabs',
- 'dmWidgetGalleryPlugin.form'
- ));
- $this->addRequiredJavascript(array(
- 'lib.ui-tabs',
- 'core.tabForm',
- 'dmWidgetGalleryPlugin.form'
- ));
-
$mediaConfig = $this->getValueOrDefault('medias');
$this->widgetSchema['media_id'] = new sfWidgetFormDoctrineChoice(array(
@@ -109,10 +99,27 @@
parent::configure();
}
+
+ public function getStylesheets()
+ {
+ return array(
+ 'lib.ui-tabs',
+ 'dmWidgetGalleryPlugin.form'
+ );
+ }
+
+ public function getJavascripts()
+ {
+ return array(
+ 'lib.ui-tabs',
+ 'core.tabForm',
+ 'dmWidgetGalleryPlugin.form'
+ );
+ }
protected function renderContent($attributes)
{
- return
self::$serviceContainer->getService('helper')->renderPartial('dmWidgetGallery',
'form', array(
+ return $this->getHelper()->renderPartial('dmWidgetGallery', 'form', array(
'form' => $this,
'medias' => $this->getMedias(),
'baseTabId' => 'dm_widget_gallery_'.$this->dmWidget->get('id')
Modified: plugins/dmWidgetGalleryPlugin/lib/dmWidgetContentGalleryView.php
===================================================================
--- plugins/dmWidgetGalleryPlugin/lib/dmWidgetContentGalleryView.php
2010-01-18 13:46:29 UTC (rev 26813)
+++ plugins/dmWidgetGalleryPlugin/lib/dmWidgetContentGalleryView.php
2010-01-18 13:47:38 UTC (rev 26814)
@@ -8,6 +8,8 @@
parent::configure();
$this->addRequiredVar(array('medias', 'method', 'animation'));
+
+ $this->addJavascript('dmWidgetGalleryPlugin.view');
}
protected function filterViewVars(array $vars = array())
@@ -92,9 +94,8 @@
if ('slideshow' == $vars['animation'])
{
- $this->addRequiredJavascript('dmWidgetGalleryPlugin.cycle');
+ $this->addJavascript('dmWidgetGalleryPlugin.cycle');
}
- $this->addRequiredJavascript('dmWidgetGalleryPlugin.view');
$html = $helper->£o('ol.dm_widget_content_gallery.list', array('json' =>
array(
'animation' => $vars['animation'],
Modified: plugins/dmWidgetGalleryPlugin/web/js/form.js
===================================================================
--- plugins/dmWidgetGalleryPlugin/web/js/form.js 2010-01-18 13:46:29 UTC
(rev 26813)
+++ plugins/dmWidgetGalleryPlugin/web/js/form.js 2010-01-18 13:47:38 UTC
(rev 26814)
@@ -38,7 +38,7 @@
<label>Link:</label> \
<input class="link dm_link_droppable page_only"
name="'+formName+'[media_link][]" value="'+media.link+'" /> \
</div> \
-<img src="/dm/core/images/cross-small.png" class="delete_media_element"
title="'+deleteMessage+'" />'
+<img src="'+$.dm.ctrl.options.dm_core_asset_root+'images/cross-small.png"
class="delete_media_element" title="'+deleteMessage+'" />'
)
.block();
Modified: plugins/dmWidgetGalleryPlugin/web/js/view.js
===================================================================
--- plugins/dmWidgetGalleryPlugin/web/js/view.js 2010-01-18 13:46:29 UTC
(rev 26813)
+++ plugins/dmWidgetGalleryPlugin/web/js/view.js 2010-01-18 13:47:38 UTC
(rev 26814)
@@ -1,42 +1,39 @@
(function($) {
-
- // on page loaded
- $(function()
- {
- // starts all galleries in the page
- $('.dm_widget_content_gallery').each(function()
- {
- // only if elements in gallery
- if ($(this).find('>li').length)
- {
- // get options from gallery metadata
- var options = $(this).metadata();
-
- if (options.animation == 'slideshow')
- {
- // launch jQuery cycle
- $(this).cycle({
- timeout: options.delay *
1000, // convert to ms
- height:
$(this).find('img:first').attr('height') // use first image height
- });
- }
- else if(options.animation == 'custom')
- {
- if ($.isFunction($.dm.customGallery))
- {
- $.dm.customGallery($(this),
options);
- }
- else
- {
- alert('You must create a
$.dm.customGallery(element, options) function in your front.js to use custom
animation');
- }
- }
- else
- {
- alert('Unknown animation
'+options.animation);
- }
- }
- });
- });
+
+ $('#dm_page div.dm_widget.dm_widget_content_gallery').live('dmWidgetLaunch',
function()
+ {
+ var $gallery = $(this).find('ol.dm_widget_content_gallery');
+ // only if elements in gallery
+ if ($gallery.find('>li').length)
+ {
+ // get options from gallery metadata
+ var options = $gallery.metadata();
+
+ if (options.animation == 'slideshow')
+ {
+ // launch jQuery cycle
+ $gallery.cycle({
+ timeout: options.delay * 1000, // convert
to ms
+ height: $gallery.find('img:first').attr('height') // use first
image height
+ });
+ }
+ else if(options.animation == 'custom')
+ {
+ if ($.isFunction($.dm.customGallery))
+ {
+ $.dm.customGallery($gallery, options);
+ }
+ else
+ {
+ alert('You must create a $.dm.customGallery(element, options)
function in your front.js to use custom animation');
+ }
+ }
+ else
+ {
+ alert('Unknown animation '+options.animation);
+ }
+ }
+ });
+
})(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.
