[limb-svn] r6568 - 3.x/trunk/limb/macro/src/tags/form
svn at limb-project.com
svn at limb-project.com
Mon Dec 3 17:08:05 MSK 2007
Author: serega
Date: 2007-12-03 17:08:05 +0300 (Mon, 03 Dec 2007)
New Revision: 6568
URL: http://fisheye.limb-project.com/changelog/limb/?cs=6568
Modified:
3.x/trunk/limb/macro/src/tags/form/form.tag.php
3.x/trunk/limb/macro/src/tags/form/form_errors.tag.php
3.x/trunk/limb/macro/src/tags/form/lmbMacroFormElementTag.class.php
3.x/trunk/limb/macro/src/tags/form/lmbMacroFormFieldWidget.class.php
3.x/trunk/limb/macro/src/tags/form/lmbMacroFormWidget.class.php
3.x/trunk/limb/macro/src/tags/form/lmbMacroHtmlTagWidget.class.php
3.x/trunk/limb/macro/src/tags/form/lmbMacroRuntimeWidgetTag.class.php
Log:
-- lmbMacroHtmlTagWidget :: $id property renamed to $runtime_id, lmbMacroHtmlTagWidget :: getId() -> getRuntimeId()
Modified: 3.x/trunk/limb/macro/src/tags/form/form.tag.php
===================================================================
--- 3.x/trunk/limb/macro/src/tags/form/form.tag.php 2007-12-03 13:48:07 UTC (rev 6567)
+++ 3.x/trunk/limb/macro/src/tags/form/form.tag.php 2007-12-03 14:08:05 UTC (rev 6568)
@@ -23,7 +23,7 @@
protected function _generateBeforeOpeningTag($code)
{
- $form = $this->getWidgetVar();
+ $form = $this->getRuntimeVar();
// passing specified variable as a datasource to form widget
if($this->has('from'))
Modified: 3.x/trunk/limb/macro/src/tags/form/form_errors.tag.php
===================================================================
--- 3.x/trunk/limb/macro/src/tags/form/form_errors.tag.php 2007-12-03 13:48:07 UTC (rev 6567)
+++ 3.x/trunk/limb/macro/src/tags/form/form_errors.tag.php 2007-12-03 14:08:05 UTC (rev 6568)
@@ -18,7 +18,7 @@
{
function generate($code)
{
- $form = $this->findParentByClass('lmbMacroFormTag')->getWidgetVar();
+ $form = $this->findParentByClass('lmbMacroFormTag')->getRuntimeVar();
$to = $this->get('to');
Modified: 3.x/trunk/limb/macro/src/tags/form/lmbMacroFormElementTag.class.php
===================================================================
--- 3.x/trunk/limb/macro/src/tags/form/lmbMacroFormElementTag.class.php 2007-12-03 13:48:07 UTC (rev 6567)
+++ 3.x/trunk/limb/macro/src/tags/form/lmbMacroFormElementTag.class.php 2007-12-03 14:08:05 UTC (rev 6568)
@@ -18,7 +18,7 @@
{
parent :: _generateWidget($code_writer);
if($form_tag = $this->findParentByClass('lmbMacroFormTag'))
- $code_writer->writePHP("{$this->getWidgetVar()}->setForm({$form_tag->getWidgetVar()});\n");
+ $code_writer->writePHP("{$this->getRuntimeVar()}->setForm({$form_tag->getRuntimeVar()});\n");
}
}
Modified: 3.x/trunk/limb/macro/src/tags/form/lmbMacroFormFieldWidget.class.php
===================================================================
--- 3.x/trunk/limb/macro/src/tags/form/lmbMacroFormFieldWidget.class.php 2007-12-03 13:48:07 UTC (rev 6567)
+++ 3.x/trunk/limb/macro/src/tags/form/lmbMacroFormFieldWidget.class.php 2007-12-03 14:08:05 UTC (rev 6568)
@@ -23,7 +23,7 @@
function getDisplayName()
{
- return $this->id;
+ return $this->runtime_id;
}
function setForm($form)
@@ -49,7 +49,7 @@
if(is_object($this->form))
{
$ds = $this->form->getDatasource();
- $id = $this->getId();
+ $id = $this->getRuntimeId();
if(isset($ds[$id]))
return $ds[$id];
}
Modified: 3.x/trunk/limb/macro/src/tags/form/lmbMacroFormWidget.class.php
===================================================================
--- 3.x/trunk/limb/macro/src/tags/form/lmbMacroFormWidget.class.php 2007-12-03 13:48:07 UTC (rev 6567)
+++ 3.x/trunk/limb/macro/src/tags/form/lmbMacroFormWidget.class.php 2007-12-03 14:08:05 UTC (rev 6568)
@@ -39,7 +39,7 @@
function addChild($child)
{
- $this->children[$child->getId()] = $child;
+ $this->children[$child->getRuntimeId()] = $child;
}
function setDatasource($datasource)
@@ -79,7 +79,7 @@
continue;
$field->setErrorState(true);
- if($label = $this->getLabelFor($field->getId()))
+ if($label = $this->getLabelFor($field->getRuntimeId()))
$label->setErrorState(true);
}
}
Modified: 3.x/trunk/limb/macro/src/tags/form/lmbMacroHtmlTagWidget.class.php
===================================================================
--- 3.x/trunk/limb/macro/src/tags/form/lmbMacroHtmlTagWidget.class.php 2007-12-03 13:48:07 UTC (rev 6567)
+++ 3.x/trunk/limb/macro/src/tags/form/lmbMacroHtmlTagWidget.class.php 2007-12-03 14:08:05 UTC (rev 6568)
@@ -16,16 +16,16 @@
{
protected $attributes = array();
- protected $id;
+ protected $runtime_id;
function __construct($id)
{
- $this->id = $id;
+ $this->runtime_id = $id;
}
- function getId()
+ function getRuntimeId()
{
- return $this->id;
+ return $this->runtime_id;
}
function setAttributes($attributes)
Modified: 3.x/trunk/limb/macro/src/tags/form/lmbMacroRuntimeWidgetTag.class.php
===================================================================
--- 3.x/trunk/limb/macro/src/tags/form/lmbMacroRuntimeWidgetTag.class.php 2007-12-03 13:48:07 UTC (rev 6567)
+++ 3.x/trunk/limb/macro/src/tags/form/lmbMacroRuntimeWidgetTag.class.php 2007-12-03 14:08:05 UTC (rev 6568)
@@ -42,28 +42,28 @@
$this->_generateAfterClosingTag($code_writer);
}
- function getWidgetVar()
+ function getRuntimeVar()
{
- return '$this->' . $this->html_tag . '_' . $this->getWidgetId();
+ return '$this->' . $this->html_tag . '_' . $this->getRuntimeId();
}
- function getWidgetId()
+ function getRuntimeId()
{
- if ($this->hasConstant('widget_id'))
- return $this->get('widget_id');
+ if ($this->hasConstant('runtime_id'))
+ return $this->get('runtime_id');
elseif($this->hasConstant('id'))
return $this->get('id');
elseif($this->hasConstant('name'))
return $this->get('name');
else
{
- $widget_id = self :: generateNewWidgetId();
- $this->set('widget_id', $widget_id);
+ $runtime_id = self :: generateNewRuntimeId();
+ $this->set('runtime_id', $runtime_id);
return $widget_id;
}
}
- static function generateNewWidgetId()
+ static function generateNewRuntimeId()
{
static $counter = 1;
return 'id00' . $counter++;
@@ -74,9 +74,9 @@
if ($this->widget_include_file)
$code_writer->registerInclude($this->widget_include_file);
- $id = $this->getWidgetId();
- $widget = $this->getWidgetVar();
- $code_writer->writeToInit("{$widget} = new {$this->widget_class_name}('{$id}');\n");
+ $runtime_id = $this->getRuntimeId();
+ $widget = $this->getRuntimeVar();
+ $code_writer->writeToInit("{$widget} = new {$this->widget_class_name}('{$runtime_id}');\n");
$code_writer->writeToInit("{$widget}->setAttributes(" . var_export($this->getConstantAttributes(), true) . ");\n");
}
@@ -86,7 +86,7 @@
$code->writeHTML("<{$this->html_tag}");
- $code->writePHP($this->getWidgetVar() . '->renderAttributes();');
+ $code->writePHP($this->getRuntimeVar() . '->renderAttributes();');
if (!$this->has_closing_tag)
$code->writeHTML(' /');
@@ -96,7 +96,7 @@
protected function _generateDynamicAttributes($code)
{
- $widget = $this->getWidgetVar();
+ $widget = $this->getRuntimeVar();
foreach(array_keys($this->attributes) as $key)
{
if ($this->attributes[$key]->isDynamic())
More information about the limb-svn
mailing list