[lux commit] r127 - in trunk/Lux/View/Helper: . Jquery

[codesite...@google.com]

Author: rodrigo.moraes
Date: Tue Mar 18 05:07:01 2008
New Revision: 127

Modified:
trunk/Lux/View/Helper/Jquery.php
trunk/Lux/View/Helper/Jquery/Accordion.php
trunk/Lux/View/Helper/Jquery/Calendar.php
trunk/Lux/View/Helper/Jquery/Dialog.php
trunk/Lux/View/Helper/Jquery/TableSorter.php
trunk/Lux/View/Helper/Jquery/Tabs.php

Log:
[CHG] Removed the $_json property from the jQuery helpers. Now uses the
Json helper.

Modified: trunk/Lux/View/Helper/Jquery.php
==============================================================================
--- trunk/Lux/View/Helper/Jquery.php (original)
+++ trunk/Lux/View/Helper/Jquery.php Tue Mar 18 05:07:01 2008
@@ -65,15 +65,6 @@

/**
*
- * A JSON object, shared by jQuery helpers.
- *
- * @param Solar_Json
- *
- */
- protected $_json;
-
- /**
- *
* Constructor.
*
* @param array $config User-provided configuration values.
@@ -269,21 +260,5 @@
$class = 'Jquery_' . ucfirst($method);
$helper = $this->_view->getHelper($class);
return call_user_func_array(array($helper, $method), $params);
- }
-
- /**
- *
- * Returns a JSON object.
- *
- * @return Solar_Json
- *
- */
- public function json()
- {
- if(!$this->_json) {
- $this->_json = Solar::factory('Solar_Json');
- }
-
- return $this->_json;
}
}

Modified: trunk/Lux/View/Helper/Jquery/Accordion.php
==============================================================================
--- trunk/Lux/View/Helper/Jquery/Accordion.php (original)
+++ trunk/Lux/View/Helper/Jquery/Accordion.php Tue Mar 18 05:07:01 2008
@@ -61,7 +61,7 @@
{
if($config) {
// Encode configuration.
- $config = $this->_view->jquery()->json()->encode($config);
+ $config = $this->_view->json()->encode($config);
}

// Add inline script.

Modified: trunk/Lux/View/Helper/Jquery/Calendar.php
==============================================================================
--- trunk/Lux/View/Helper/Jquery/Calendar.php (original)
+++ trunk/Lux/View/Helper/Jquery/Calendar.php Tue Mar 18 05:07:01 2008
@@ -70,7 +70,7 @@
}

// Encode configuration.
- $config = $this->_view->jquery()->json()->encode($config);
+ $config = $this->_view->json()->encode($config);

// Add inline script.
$code = '$("' . $selector . '").calendar(' . $config . ');';

Modified: trunk/Lux/View/Helper/Jquery/Dialog.php
==============================================================================
--- trunk/Lux/View/Helper/Jquery/Dialog.php (original)
+++ trunk/Lux/View/Helper/Jquery/Dialog.php Tue Mar 18 05:07:01 2008
@@ -65,7 +65,7 @@
{
if($config) {
// Encode configuration.
- $config = $this->_view->jquery()->json()->encode($config);
+ $config = $this->_view->json()->encode($config);
} else {
$config = '';
}

Modified: trunk/Lux/View/Helper/Jquery/TableSorter.php
==============================================================================
--- trunk/Lux/View/Helper/Jquery/TableSorter.php (original)
+++ trunk/Lux/View/Helper/Jquery/TableSorter.php Tue Mar 18 05:07:01 2008
@@ -61,7 +61,7 @@
{
if($config) {
// Encode configuration.
- $config = $this->_view->jquery()->json()->encode($config);
+ $config = $this->_view->json()->encode($config);
}

// Add inline script.

Modified: trunk/Lux/View/Helper/Jquery/Tabs.php
==============================================================================
--- trunk/Lux/View/Helper/Jquery/Tabs.php (original)
+++ trunk/Lux/View/Helper/Jquery/Tabs.php Tue Mar 18 05:07:01 2008
@@ -63,7 +63,7 @@
{
if($config) {
// Encode configuration.
- $config = $this->_view->jquery()->json()->encode($config, $deQuote);
+ $config = $this->_view->json()->encode($config, $deQuote);
}

// Add inline script.