Forráskód Böngészése

[ZF-11835] Zend_View_Helper
Fixed: Add conditional comments functionality to Zend_View_Helper_HeadMeta


git-svn-id: http://framework.zend.com/svn/framework/standard/trunk@24561 44c647ce-9c0f-0410-b52a-842ac1e357ba

adamlundrigan 14 éve
szülő
commit
c5ac4bf6b0

+ 8 - 0
library/Zend/View/Helper/HeadMeta.php

@@ -375,6 +375,14 @@ class Zend_View_Helper_HeadMeta extends Zend_View_Helper_Placeholder_Container_S
             $this->_escape($item->content),
             $modifiersString
         );
+        
+        if (isset($item->modifiers['conditional'])
+            && !empty($item->modifiers['conditional'])
+            && is_string($item->modifiers['conditional']))
+        {
+            $meta = '<!--[if ' . $this->_escape($item->modifiers['conditional']) . ']>' . $meta . '<![endif]-->';
+        }
+        
         return $meta;
     }
 

+ 12 - 1
tests/Zend/View/Helper/HeadMetaTest.php

@@ -521,7 +521,18 @@ class Zend_View_Helper_HeadMetaTest extends PHPUnit_Framework_TestCase
 			'<meta charset="utf-8"/>',
 			$view->headMeta()->toString());
 	}
-
+    
+    /**
+     * @group ZF-11835
+     */
+    public function testConditional() 
+    {
+        $html = $this->helper->appendHttpEquiv('foo', 'bar', array('conditional' => 'lt IE 7'))->toString();
+        
+        $this->assertRegExp("|^<!--\[if lt IE 7\]>|", $html);
+        $this->assertRegExp("|<!\[endif\]-->$|", $html);
+    }
+    
 }
 
 // Call Zend_View_Helper_HeadMetaTest::main() if this source file is executed directly.