Author: ornicar2
Date: 2010-01-19 14:01:58 +0100 (Tue, 19 Jan 2010)
New Revision: 26875
Modified:
plugins/diemPlugin/trunk/dmCorePlugin/lib/action/dmBaseActions.php
plugins/diemPlugin/trunk/dmCorePlugin/lib/form/dmForm.php
plugins/diemPlugin/trunk/dmFrontPlugin/modules/dmCodeEditor/actions/actions.class.php
plugins/diemPlugin/trunk/dmFrontPlugin/modules/dmCodeEditor/templates/_launch.php
plugins/diemPlugin/trunk/dmFrontPlugin/modules/dmWidget/lib/BasedmWidgetActions.class.php
Log:
[Diem]
- made front code editor use new async assets loading style
Modified: plugins/diemPlugin/trunk/dmCorePlugin/lib/action/dmBaseActions.php
===================================================================
--- plugins/diemPlugin/trunk/dmCorePlugin/lib/action/dmBaseActions.php
2010-01-19 13:01:28 UTC (rev 26874)
+++ plugins/diemPlugin/trunk/dmCorePlugin/lib/action/dmBaseActions.php
2010-01-19 13:01:58 UTC (rev 26875)
@@ -113,7 +113,6 @@
return $backUrl;
}
-
protected function getRouting()
{
return $this->context->getRouting();
@@ -160,7 +159,7 @@
if (!isset($options['type']))
{
- $options['type'] =
$this->context->get('mime_type_resolver')->getByFilename($options['file_name']);
+ $options['type'] =
$this->getService('mime_type_resolver')->getByFilename($options['file_name']);
}
//Gather relevent info about file
@@ -180,6 +179,7 @@
header("Content-Disposition: attachment;
filename=\"".$options['file_name']."\";");
header("Content-Transfer-Encoding: binary");
header("Content-Length: ".$fileLenght);
+
print $data;
exit;
}
Modified: plugins/diemPlugin/trunk/dmCorePlugin/lib/form/dmForm.php
===================================================================
--- plugins/diemPlugin/trunk/dmCorePlugin/lib/form/dmForm.php 2010-01-19
13:01:28 UTC (rev 26874)
+++ plugins/diemPlugin/trunk/dmCorePlugin/lib/form/dmForm.php 2010-01-19
13:01:58 UTC (rev 26875)
@@ -47,7 +47,6 @@
{
return $this->key;
}
-
public function removeCsrfProtection()
{
Modified:
plugins/diemPlugin/trunk/dmFrontPlugin/modules/dmCodeEditor/actions/actions.class.php
===================================================================
---
plugins/diemPlugin/trunk/dmFrontPlugin/modules/dmCodeEditor/actions/actions.class.php
2010-01-19 13:01:28 UTC (rev 26874)
+++
plugins/diemPlugin/trunk/dmFrontPlugin/modules/dmCodeEditor/actions/actions.class.php
2010-01-19 13:01:58 UTC (rev 26875)
@@ -7,21 +7,11 @@
{
$this->fileMenu =
$this->getService('front_code_editor_file_menu')->build();
- $js =
-
file_get_contents($this->getHelper()->getJavascriptFullPath('lib.ui-tabs')).
- dmJsMinifier::transform(
-
file_get_contents($this->getHelper()->getJavascriptFullPath('core.codeArea')).
-
file_get_contents($this->getHelper()->getJavascriptFullPath('front.codeEditor'))
- );
-
- return $this->renderJson(array(
- 'html' => $this->getPartial('dmCodeEditor/launch'),
- 'js' => $js,
- 'stylesheets' => array(
- $this->getHelper()->getStylesheetWebPath('lib.ui-tabs'),
- $this->getHelper()->getStylesheetWebPath('front.codeEditor')
- )
- ));
+ return $this->renderAsync(array(
+ 'html' => $this->getPartial('dmCodeEditor/launch'),
+ 'js' => array('lib.ui-tabs', 'core.codeArea', 'front.codeEditor'),
+ 'css' => array('lib.ui-tabs', 'front.codeEditor')
+ ), true);
}
public function executeFile(dmWebRequest $request)
@@ -58,7 +48,7 @@
try
{
- @$this->context->get('file_backup')->save($file);
+ @$this->getService('file_backup')->save($file);
}
catch(dmException $e)
{
@@ -74,7 +64,7 @@
{
$return = array(
'type' => 'css',
- 'path' =>
$this->context->get('helper')->getStylesheetWebPath(dmOs::getFileWithoutExtension($file))
+ 'path' =>
$this->getHelper()->getStylesheetWebPath(dmOs::getFileWithoutExtension($file))
);
}
else
@@ -97,9 +87,9 @@
*/
$module = preg_replace('|^/([^/]+)/.+|', '$1',
str_replace(dmOs::normalize(sfConfig::get('sf_app_module_dir')), '', $file));
- $helper = $this->context->get('page_helper');
$widgets = array();
- foreach($helper->getAreas() as $areaArray)
+
+ foreach($this->getService('page_helper')->getAreas() as $areaArray)
{
foreach($areaArray['Zones'] as $zoneArray)
{
@@ -108,7 +98,10 @@
if($widgetArray['module'] === $module)
{
ob_start();
- $widgets[$widgetArray['id']] =
$helper->renderWidgetInner($widgetArray);
+
+ $widgets[$widgetArray['id']] =
$this->getService('page_helper')->renderWidgetInner($widgetArray);
+
+ // include debugging output
if( $output = ob_get_clean())
{
$widgets[$widgetArray['id']] =
$output.$widgets[$widgetArray['id']];
Modified:
plugins/diemPlugin/trunk/dmFrontPlugin/modules/dmCodeEditor/templates/_launch.php
===================================================================
---
plugins/diemPlugin/trunk/dmFrontPlugin/modules/dmCodeEditor/templates/_launch.php
2010-01-19 13:01:28 UTC (rev 26874)
+++
plugins/diemPlugin/trunk/dmFrontPlugin/modules/dmCodeEditor/templates/_launch.php
2010-01-19 13:01:58 UTC (rev 26875)
@@ -1,19 +1,12 @@
<?php
-echo £o('div.dm_code_editor_wrap');
-
-echo £o('div.dm_code_editor');
-
-echo £o('ul.tabs');
-
- echo £('li.dm_file_open',
- £('a.s16block.s16_folder_open href=#dm_code_editor_file_open title=Open',
'Open')
- );
-
-echo £c('ul');
-
-echo '<div id="dm_code_editor_file_open">'.$fileMenu->render().'</div>';
-
-echo £c('div');
-
-echo £c('div');
\ No newline at end of file
+echo £('div.dm_code_editor_wrap',
+ £('div.dm_code_editor',
+ £('ul.tabs',
+ £('li.dm_file_open',
+ £('a.s16block.s16_folder_open href=#dm_code_editor_file_open
title=Open', 'Open')
+ )
+ ).
+ £('div#dm_code_editor_file_open', $fileMenu->render())
+ )
+);
\ No newline at end of file
Modified:
plugins/diemPlugin/trunk/dmFrontPlugin/modules/dmWidget/lib/BasedmWidgetActions.class.php
===================================================================
---
plugins/diemPlugin/trunk/dmFrontPlugin/modules/dmWidget/lib/BasedmWidgetActions.class.php
2010-01-19 13:01:28 UTC (rev 26874)
+++
plugins/diemPlugin/trunk/dmFrontPlugin/modules/dmWidget/lib/BasedmWidgetActions.class.php
2010-01-19 13:01:58 UTC (rev 26875)
@@ -58,7 +58,7 @@
$widgetRenderer = $this->getServiceContainer()
->setParameter('widget_renderer.widget', $widgetArray)
->getService('widget_renderer');
- $js = $widgetRenderer->getJavascripts();
+ $js = $widgetRenderer->getJavascripts();
$css = $widgetRenderer->getStylesheets();
}
catch(Exception $e)
@@ -159,7 +159,7 @@
$widgetRenderer = $this->getServiceContainer()
->setParameter('widget_renderer.widget', $widgetArray)
->getService('widget_renderer');
- $js = $widgetRenderer->getJavascripts();
+ $js = $widgetRenderer->getJavascripts();
$css = $widgetRenderer->getStylesheets();
}
catch(Exception $e)
--
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.
