Changeset 8836

Timestamp:

05/07/08 18:51:20 (2 years ago)

Author:

FabianLange

Message:

fixed some issues with butto_to helper, query string is now appended correctly, short notation of attributes is parsed correctly, some internal refactoring and unit tests. fixes #3184

Files:

• branches/1.0/lib/helper/UrlHelper.php (modified) (6 diffs)
• branches/1.0/test/unit/helper/UrlHelperTest.php (modified) (2 diffs)

branches/1.0/lib/helper/UrlHelper.php

@@ -239 +239 @@
- * @see    url_for, link_to
- */
-
-
-convert_option
+ =''
+
+parse_attribute
-  $html_options['value'] = $name;
-
@@ -256 +256 @@
-    return form_tag($internal_uri, array('method' => 'post', 'class' => 'button_to')).content_tag('div', tag('input', $html_options)).'</form>';
-  }
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  }
-  else
-  {
-
-
+
-    $html_options = _convert_options_to_javascript($html_options);
-
-
-}
+
+
+return tag('input', $html_options);
-}
-
@@ -333 +340 @@
-}
-
-internal_uri = '
+url = 'this.href
-{
-  // confirm
@@ -355 +362 @@
-  else if ($confirm && $popup)
-  {
-internal_uri
+url
-  }
-  else if ($confirm && $post)
@@ -378 +385 @@
-  else if ($popup)
-  {
-internal_uri
+url
-  }
-
@@ -389 +396 @@
-}
-
-
-
-
-
+
+
-  if (is_array($popup))
-  {

branches/1.0/test/unit/helper/UrlHelperTest.php

@@ -43 +43 @@
-}
-
-6
+9
-
-$context = sfContext::getInstance();
@@ -61 +61 @@
-$t->is(link_to('test', '', array('query_string' => 'foo=bar')), '<a href="module/action?foo=bar">test</a>', 'link_to() can take an "query_string" option');
-$t->is(link_to(''), '<a href="module/action">module/action</a>', 'link_to() takes the url as the link name if the first argument is empty');
+
+//button_to()
+$t->diag('button_to()');
+$t->is(button_to('test'), '<input value="test" type="button" onclick="document.location.href=\'module/action\';" />', 'button_to() returns an HTML "input" tag');
+$t->is(button_to('test','', array('query_string' => 'foo=bar')), '<input value="test" type="button" onclick="document.location.href=\'module/action?foo=bar\';" />', 'button_to() returns an HTML "input" tag');
+$t->is(button_to('test','', array('popup' => 'true', 'query_string' => 'foo=bar')), '<input value="test" type="button" onclick="var w=window.open(\'module/action?foo=bar\');w.focus();return false;" />', 'button_to() returns an HTML "input" tag');
+
-class testObject
-{