Author: ornicar2
Date: 2010-01-27 15:10:17 +0100 (Wed, 27 Jan 2010)
New Revision: 27247
Removed:
plugins/diemPlugin/trunk/dmCorePlugin/web/lib/jmap/
Modified:
plugins/diemPlugin/trunk/dmCorePlugin/config/dm/assets.yml
plugins/diemPlugin/trunk/dmCorePlugin/config/dm/services.yml
plugins/diemPlugin/trunk/dmCorePlugin/lib/response/dmWebResponse.php
plugins/diemPlugin/trunk/dmCorePlugin/lib/task/dmDataTask.class.php
plugins/diemPlugin/trunk/dmCorePlugin/lib/view/dmHelper.php
Log:
[Diem]
- removed all google maps related stuff from the core (moved them to a plugin)
- reduced helper service dependencies
Modified: plugins/diemPlugin/trunk/dmCorePlugin/config/dm/assets.yml
===================================================================
--- plugins/diemPlugin/trunk/dmCorePlugin/config/dm/assets.yml 2010-01-27
13:20:52 UTC (rev 27246)
+++ plugins/diemPlugin/trunk/dmCorePlugin/config/dm/assets.yml 2010-01-27
14:10:17 UTC (rev 27247)
@@ -46,7 +46,6 @@
expose: expose/jquery.expose-1.0.1.min
qtip: qtip/jquery.qtip-1.0.0-rc3.min
hotkeys: hotkeys/jquery.hotkeys-0.7.9.min
- jmap: jmap/jquery.jmap.min
tree-component: jsTree/source/tree_component.min
tree-css: jsTree/source/css
fieldSelection: jquery-fieldselection/jquery-fieldselection
Modified: plugins/diemPlugin/trunk/dmCorePlugin/config/dm/services.yml
===================================================================
--- plugins/diemPlugin/trunk/dmCorePlugin/config/dm/services.yml
2010-01-27 13:20:52 UTC (rev 27246)
+++ plugins/diemPlugin/trunk/dmCorePlugin/config/dm/services.yml
2010-01-27 14:10:17 UTC (rev 27247)
@@ -352,7 +352,7 @@
helper:
class: %helper.class%
shared: true
- arguments: [ @dispatcher, @context, %helper.options% ]
+ arguments: [ @context, %helper.options% ]
link_tag_factory:
class: %link_tag_factory.class%
Modified: plugins/diemPlugin/trunk/dmCorePlugin/lib/response/dmWebResponse.php
===================================================================
--- plugins/diemPlugin/trunk/dmCorePlugin/lib/response/dmWebResponse.php
2010-01-27 13:20:52 UTC (rev 27246)
+++ plugins/diemPlugin/trunk/dmCorePlugin/lib/response/dmWebResponse.php
2010-01-27 14:10:17 UTC (rev 27247)
@@ -12,8 +12,6 @@
public function initialize(sfEventDispatcher $dispatcher, $options = array())
{
- $options['with_google_maps'] = false;
-
parent::initialize($dispatcher, $options);
$this->javascriptConfig = array();
@@ -28,37 +26,6 @@
$this->dispatcher->connect('dm.layout.filter_javascripts', array($this,
'listenToFilterJavascriptsEvent'));
}
-
- /*
- * Add the google maps api to the response
- */
- public function withGoogleMaps($val = true)
- {
- $this->options['with_google_maps'] = (bool) $val;
- }
-
- public function listenToFilterJavascriptsEvent(sfEvent $event, array $assets)
- {
- if ($this->options['with_google_maps'])
- {
- if (!($key = dmConfig::get('gmap_key')) && $this->options['logging'])
- {
- $this->dispatcher->notify(new sfEvent($this, 'application.log',
array('priority' => sfLogger::ERR, 'dmResponse can not load google maps api.
You must provide an api key in the configuration panel')));
- }
- else
- {
- $config = dmArray::get(sfConfig::get('dm_js_api'), 'gmap',
array('version' => 2, 'sensor' => false, 'url' =>
'http://maps.google.com/maps?file=api&v=%version%&sensor=%sensor%&key=%key%'));
-
- $assets[strtr($config['url'], array(
- '%version%' => $config['version'],
- '%sensor%' => $config['sensor'] ? 'true' : 'false',
- '%key%' => $key
- ))] = array();
- }
- }
-
- return $assets;
- }
/**
* Listens to the user.change_culture event.
Modified: plugins/diemPlugin/trunk/dmCorePlugin/lib/task/dmDataTask.class.php
===================================================================
--- plugins/diemPlugin/trunk/dmCorePlugin/lib/task/dmDataTask.class.php
2010-01-27 13:20:52 UTC (rev 27246)
+++ plugins/diemPlugin/trunk/dmCorePlugin/lib/task/dmDataTask.class.php
2010-01-27 14:10:17 UTC (rev 27247)
@@ -98,10 +98,6 @@
'group_name' => 'tracking',
'credentials' => 'xiti'
),
- 'gmap_key' => array(
- 'description' => 'The google map key ( e.g.
ABQIAAAARcvUUsf4RP8fmjHaFYFYQxRhf7uCiJccoEylUqtC2qy_Rw3WKhSEa96 )',
- 'group_name' =>'external services'
- ),
'search_stop_words' => array(
'type' => 'textarea',
'description' => 'Words to exclude from searches (e.g. the, a, to )',
Modified: plugins/diemPlugin/trunk/dmCorePlugin/lib/view/dmHelper.php
===================================================================
--- plugins/diemPlugin/trunk/dmCorePlugin/lib/view/dmHelper.php 2010-01-27
13:20:52 UTC (rev 27246)
+++ plugins/diemPlugin/trunk/dmCorePlugin/lib/view/dmHelper.php 2010-01-27
14:10:17 UTC (rev 27247)
@@ -3,14 +3,11 @@
class dmHelper extends dmConfigurable
{
protected
- $dispatcher,
$context,
- $serviceContainer,
- $options;
+ $serviceContainer;
- public function __construct(sfEventDispatcher $dispatcher, dmContext
$context, array $options = array())
+ public function __construct(dmContext $context, array $options = array())
{
- $this->dispatcher = $dispatcher;
$this->context = $context;
$this->serviceContainer = $context->getServiceContainer();
--
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.
