Просмотр исходного кода

Reverting r21317 based on disucssion on #zftalk.dev . Now allowing for enabling/disabling through options

git-svn-id: http://framework.zend.com/svn/framework/standard/trunk@21318 44c647ce-9c0f-0410-b52a-842ac1e357ba
freak 16 лет назад
Родитель
Сommit
2a408befde

+ 1 - 1
library/Zend/Application/Resource/Dojo.php

@@ -66,7 +66,7 @@ class Zend_Application_Resource_Dojo
             $view = $this->getBootstrap()->view;
 
             Zend_Dojo::enableView($view);
-            $view->dojo()->setOptions($this->getOptions())->enable();
+            $view->dojo()->setOptions($this->getOptions());
 
             $this->_dojo = $view->dojo();
         }

+ 6 - 0
library/Zend/Dojo/View/Helper/Dojo/Container.php

@@ -267,6 +267,12 @@ class Zend_Dojo_View_Helper_Dojo_Container
                 case 'registerdojostylesheet':
                     $this->registerDojoStylesheet($value);
                     break;
+                case 'enable':
+                	if($value == 0) {
+                		$this->disable();
+                	} else {
+                		$this->enable();
+                	}
             }
         }