Changeset 8907

Timestamp:

05/10/08 23:39:17 (4 months ago)

Author:

fabien

Message:

fixed HTML attributes for Date, Time, and DateTime? widgets (closes #3480)

Files:

• branches/1.1/lib/widget/sfWidgetFormDate.class.php (modified) (1 diff)
• branches/1.1/lib/widget/sfWidgetFormDateTime.class.php (modified) (5 diffs)
• branches/1.1/lib/widget/sfWidgetFormTime.class.php (modified) (2 diffs)
• branches/1.1/test/unit/widget/sfWidgetFormDateTest.php (modified) (2 diffs)
• branches/1.1/test/unit/widget/sfWidgetFormDateTimeTest.php (modified) (2 diffs)
• branches/1.1/test/unit/widget/sfWidgetFormTimeTest.php (modified) (2 diffs)

branches/1.1/lib/widget/sfWidgetFormDate.class.php

@@ -73 +73 @@
-
-    // days
-
+, array_merge($this->attributes, $attributes)
-    $date['%day%'] = $widget->render($name.'[day]', $value['day']);
-
-    // months
-
+, array_merge($this->attributes, $attributes)
-    $date['%month%'] = $widget->render($name.'[month]', $value['month']);
-
-    // years
-
+, array_merge($this->attributes, $attributes)
-    $date['%year%'] = $widget->render($name.'[year]', $value['year']);
-

branches/1.1/lib/widget/sfWidgetFormDateTime.class.php

@@ -19 +19 @@
-class sfWidgetFormDateTime extends sfWidgetForm
-{
-  protected
-    $defaultAttributes = array('date' => array(), 'time' => array());
-
-  /**
-   * Configures the current widget.
@@ -45 +42 @@
-    $this->addOption('with_time', true);
-    $this->addOption('format', '%date% %time%');
-
-    if (isset($attributes['date']))
-    {
-      $defaultAttributes['time'] = $attributes['date'];
-      unset($attributes['date']);
-    }
-
-    if (isset($attributes['time']))
-    {
-      $defaultAttributes['time'] = $attributes['time'];
-      unset($attributes['time']);
-    }
-  }
-
@@ -65 +50 @@
-  {
-    // date
-
+$attributes
-
-    if (!$this->getOption('with_time'))
@@ -74 +59 @@
-    return strtr($this->getOption('format'), array(
-      '%date%' => $date,
-
+$attributes
-    ));
-  }
-
-  /**
-
+
+
+
-   *
-   * @return sfWidgetForm A Widget representing the date
-   */
-
+$attributes
-  {
-
+, $attributes
-  }
-
-  /**
-
+
+
+
-   *
-   * @return sfWidgetForm A Widget representing the time
-   */
-
+$attributes
-  {
-
+, $attributes
-  }
-
-  /**
-
+.
-   *
-   * @param  string The type (date or time)
@@ -117 +106 @@
-
-  /**
-
+.
-   *
-   * @param  string The type (date or time)
+   * @param  array  An array of attributes
-   *
-   * @return array  An array of HTML attributes
-   */
-
+, $attributes
-  {
-
+
+
+
-  }
-}

branches/1.1/lib/widget/sfWidgetFormTime.class.php

@@ -76 +76 @@
-
-    // hours
-
+, array_merge($this->attributes, $attributes)
-    $time['%hour%'] = $widget->render($name.'[hour]', $value['hour']);
-
-    // minutes
-
+, array_merge($this->attributes, $attributes)
-    $time['%minute%'] = $widget->render($name.'[minute]', $value['minute']);
-
@@ -86 +86 @@
-    {
-      // seconds
-
+, array_merge($this->attributes, $attributes)
-      $time['%second%'] = $widget->render($name.'[second]', $value['second']);
-    }

branches/1.1/test/unit/widget/sfWidgetFormDateTest.php

@@ -11 +11 @@
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
-
-5
+7
-
-$w = new sfWidgetFormDate();
@@ -113 +113 @@
-$t->is(count($css->matchAll('#foo_month option')->getNodes()), 4, '__construct() can change the default array used for months');
-$t->is(count($css->matchAll('#foo_day option')->getNodes()), 3, '__construct() can change the default array used for days');
+
+// attributes
+$t->diag('attributes');
+$dom->loadHTML($w->render('foo', '2005-10-15', array('disabled' => 'disabled')));
+$t->is(count($css->matchAll('select[disabled="disabled"]')->getNodes()), 3, '->render() takes the attributes into account for all the three embedded widgets');
+
+$w->setAttribute('disabled', 'disabled');
+$dom->loadHTML($w->render('foo', '2005-10-15'));
+$t->is(count($css->matchAll('select[disabled="disabled"]')->getNodes()), 3, '->render() takes the attributes into account for all the three embedded widgets');

branches/1.1/test/unit/widget/sfWidgetFormDateTimeTest.php

@@ -11 +11 @@
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
-
-2
+4
-
-$dom = new DomDocument('1.0', 'utf-8');
@@ -120 +120 @@
-  $t->pass('__construct() throws a InvalidArgumentException if the date/time options is not an array');
-}
+
+// attributes
+$t->diag('attributes');
+$w = new sfWidgetFormDateTime();
+$dom->loadHTML($w->render('foo', '2005-10-15 12:30:35', array('date' => array('disabled' => 'disabled'), 'time' => array('disabled' => 'disabled'))));
+$t->is(count($css->matchAll('select[disabled="disabled"]')->getNodes()), 5, '->render() takes the attributes into account for all the five embedded widgets');
+
+$w->setAttribute('date', array('disabled' => 'disabled'));
+$w->setAttribute('time', array('disabled' => 'disabled'));
+$dom->loadHTML($w->render('foo', '2005-10-15 12:30:35'));
+$t->is(count($css->matchAll('select[disabled="disabled"]')->getNodes()), 5, '->render() takes the attributes into account for all the five embedded widgets');

branches/1.1/test/unit/widget/sfWidgetFormTimeTest.php

@@ -11 +11 @@
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
-
-5
+7
-
-$w = new sfWidgetFormTime(array('with_seconds' => true));
@@ -124 +124 @@
-$t->like($css->matchSingle('#foo_hour')->getNode()->nextSibling->nodeValue, '/^#/', '__construct() can change the default format');
-$t->ok(!count($css->matchSingle('#foo_second')->getNodes()), '__construct() can change the default format');
+
+// attributes
+$t->diag('attributes');
+$w->setOption('with_seconds', true);
+$dom->loadHTML($w->render('foo', '12:30:35', array('disabled' => 'disabled')));
+$t->is(count($css->matchAll('select[disabled="disabled"]')->getNodes()), 3, '->render() takes the attributes into account for all the three embedded widgets');
+
+$w->setAttribute('disabled', 'disabled');
+$dom->loadHTML($w->render('foo', '12:30:35'));
+$t->is(count($css->matchAll('select[disabled="disabled"]')->getNodes()), 3, '->render() takes the attributes into account for all the three embedded widgets');