Merge pull request #26 from hpbuniat/master

"Among with other minor updates, this should fix #15. I think #12, #17, #21 and #23 were also fixed." From @hpbuniat
padolsey-archive · Jun 13, 2011 · a494654 · a494654
2 parents 551c210 + 528ea17
commit a494654
Show file tree

Hide file tree

Showing 7 changed files with 240 additions and 196 deletions.
diff --git a/jquery.lint.js b/jquery.lint.js
diff --git a/meta/api.js b/meta/api.js
diff --git a/meta/api.php b/meta/api.php
@@ -103,6 +103,9 @@ private function _parse() {
                         elseif ($aArg['name'] === 'collection' and $aArg['type'] === 'Object') {
                             $aArg['type'] = 'Object, Array';
                         }
+                        elseif (($aArg['name'] === 'htmlString' or $aArg['name'] === 'textString') and $aArg['type'] === 'String') {
+                            $aArg['type'] = 'String, Number';
+                        }
                         elseif ($aArg['name'] === 'target' and $aArg['type'] === 'Object') {
                             $aArg['type'] = 'Object, Function';
                             $aArg['multiple'] = true;

diff --git a/test/qunit.css b/test/qunit.css
@@ -1,17 +1,17 @@
 /**
  * QUnit - A JavaScript Unit Testing Framework
- * 
+ *
  * http://docs.jquery.com/QUnit
  *
- * Copyright (c) 2011 John Resig, Jörn Zaefferer
+ * Copyright (c) 2011 John Resig, JÃ¶rn Zaefferer
  * Dual licensed under the MIT (MIT-LICENSE.txt)
  * or GPL (GPL-LICENSE.txt) licenses.
  */
 
 /** Font Family and Sizes */
 
 #qunit-tests, #qunit-header, #qunit-banner, #qunit-testrunner-toolbar, #qunit-userAgent, #qunit-testresult {
-	font-family: "Helvetica Neue Light", "HelveticaNeue-Light", "Helvetica Neue", Calibri, Helvetica, Arial, sans-serif;
+    font-family: "Helvetica Neue Light", "HelveticaNeue-Light", "Helvetica Neue", Calibri, Helvetica, Arial, sans-serif;
 }
 
 #qunit-testrunner-toolbar, #qunit-userAgent, #qunit-testresult, #qunit-tests li { font-size: small; }
@@ -21,133 +21,133 @@
 /** Resets */
 
 #qunit-tests, #qunit-tests ol, #qunit-header, #qunit-banner, #qunit-userAgent, #qunit-testresult {
-	margin: 0;
-	padding: 0;
+    margin: 0;
+    padding: 0;
 }
 
 
 /** Header */
 
 #qunit-header {
-	padding: 0.5em 0 0.5em 1em;
+    padding: 0.5em 0 0.5em 1em;
+
+    color: #8699a4;
+    background-color: #0d3349;
 
-	color: #8699a4;
-	background-color: #0d3349;
+    font-size: 1.5em;
+    line-height: 1em;
+    font-weight: normal;
 
-	font-size: 1.5em;
-	line-height: 1em;
-	font-weight: normal;
-
-	border-radius: 15px 15px 0 0;
-	-moz-border-radius: 15px 15px 0 0;
-	-webkit-border-top-right-radius: 15px;
-	-webkit-border-top-left-radius: 15px;
+    border-radius: 15px 15px 0 0;
+    -moz-border-radius: 15px 15px 0 0;
+    -webkit-border-top-right-radius: 15px;
+    -webkit-border-top-left-radius: 15px;
 }
 
 #qunit-header a {
-	text-decoration: none;
-	color: #c2ccd1;
+    text-decoration: none;
+    color: #c2ccd1;
 }
 
 #qunit-header a:hover,
 #qunit-header a:focus {
-	color: #fff;
+    color: #fff;
 }
 
 #qunit-banner {
-	height: 5px;
+    height: 5px;
 }
 
 #qunit-testrunner-toolbar {
-	padding: 0.5em 0 0.5em 2em;
-	color: #5E740B;
-	background-color: #eee;
+    padding: 0.5em 0 0.5em 2em;
+    color: #5E740B;
+    background-color: #eee;
 }
 
 #qunit-userAgent {
-	padding: 0.5em 0 0.5em 2.5em;
-	background-color: #2b81af;
-	color: #fff;
-	text-shadow: rgba(0, 0, 0, 0.5) 2px 2px 1px;
+    padding: 0.5em 0 0.5em 2.5em;
+    background-color: #2b81af;
+    color: #fff;
+    text-shadow: rgba(0, 0, 0, 0.5) 2px 2px 1px;
 }
 
 
 /** Tests: Pass/Fail */
 
 #qunit-tests {
-	list-style-position: inside;
+    list-style-position: inside;
 }
 
 #qunit-tests li {
-	padding: 0.4em 0.5em 0.4em 2.5em;
-	border-bottom: 1px solid #fff;
-	list-style-position: inside;
+    padding: 0.4em 0.5em 0.4em 2.5em;
+    border-bottom: 1px solid #fff;
+    list-style-position: inside;
 }
 
 #qunit-tests.hidepass li.pass, #qunit-tests.hidepass li.running  {
-	display: none;
+    display: none;
 }
 
 #qunit-tests li strong {
-	cursor: pointer;
+    cursor: pointer;
 }
 
 #qunit-tests li a {
-	padding: 0.5em;
-	color: #c2ccd1;
-	text-decoration: none;
+    padding: 0.5em;
+    color: #c2ccd1;
+    text-decoration: none;
 }
 #qunit-tests li a:hover,
 #qunit-tests li a:focus {
-	color: #000;
+    color: #000;
 }
 
 #qunit-tests ol {
-	margin-top: 0.5em;
-	padding: 0.5em;
-	
-	background-color: #fff;
-	
-	border-radius: 15px;
-	-moz-border-radius: 15px;
-	-webkit-border-radius: 15px;
-	
-	box-shadow: inset 0px 2px 13px #999;
-	-moz-box-shadow: inset 0px 2px 13px #999;
-	-webkit-box-shadow: inset 0px 2px 13px #999;
+    margin-top: 0.5em;
+    padding: 0.5em;
+
+    background-color: #fff;
+
+    border-radius: 15px;
+    -moz-border-radius: 15px;
+    -webkit-border-radius: 15px;
+
+    box-shadow: inset 0px 2px 13px #999;
+    -moz-box-shadow: inset 0px 2px 13px #999;
+    -webkit-box-shadow: inset 0px 2px 13px #999;
 }
 
 #qunit-tests table {
-	border-collapse: collapse;
-	margin-top: .2em;
+    border-collapse: collapse;
+    margin-top: .2em;
 }
 
 #qunit-tests th {
-	text-align: right;
-	vertical-align: top;
-	padding: 0 .5em 0 0;
+    text-align: right;
+    vertical-align: top;
+    padding: 0 .5em 0 0;
 }
 
 #qunit-tests td {
-	vertical-align: top;
+    vertical-align: top;
 }
 
 #qunit-tests pre {
-	margin: 0;
-	white-space: pre-wrap;
-	word-wrap: break-word;
+    margin: 0;
+    white-space: pre-wrap;
+    word-wrap: break-word;
 }
 
 #qunit-tests del {
-	background-color: #e0f2be;
-	color: #374e0c;
-	text-decoration: none;
+    background-color: #e0f2be;
+    color: #374e0c;
+    text-decoration: none;
 }
 
 #qunit-tests ins {
-	background-color: #ffcaca;
-	color: #500;
-	text-decoration: none;
+    background-color: #ffcaca;
+    color: #500;
+    text-decoration: none;
 }
 
 /*** Test Counts */
@@ -157,24 +157,24 @@
 #qunit-tests b.failed                       { color: #710909; }
 
 #qunit-tests li li {
-	margin: 0.5em;
-	padding: 0.4em 0.5em 0.4em 0.5em;
-	background-color: #fff;
-	border-bottom: none;
-	list-style-position: inside;
+    margin: 0.5em;
+    padding: 0.4em 0.5em 0.4em 0.5em;
+    background-color: #fff;
+    border-bottom: none;
+    list-style-position: inside;
 }
 
 /*** Passing Styles */
 
 #qunit-tests li li.pass {
-	color: #5E740B;
-	background-color: #fff;
-	border-left: 26px solid #C6E746;
+    color: #5E740B;
+    background-color: #fff;
+    border-left: 26px solid #C6E746;
 }
 
 #qunit-tests .pass                          { color: #528CE0; background-color: #D2E0E6; }
 #qunit-tests .pass .test-name               { color: #366097; }
- 
+
 #qunit-tests .pass .test-actual,
 #qunit-tests .pass .test-expected           { color: #999999; }
 
@@ -183,16 +183,16 @@
 /*** Failing Styles */
 
 #qunit-tests li li.fail {
-	color: #710909;
-	background-color: #fff;
-	border-left: 26px solid #EE5757;
+    color: #710909;
+    background-color: #fff;
+    border-left: 26px solid #EE5757;
 }
 
 #qunit-tests > li:last-child {
-	border-radius: 0 0 15px 15px;
-	-moz-border-radius: 0 0 15px 15px;
-	-webkit-border-bottom-right-radius: 15px;
-	-webkit-border-bottom-left-radius: 15px;
+    border-radius: 0 0 15px 15px;
+    -moz-border-radius: 0 0 15px 15px;
+    -webkit-border-bottom-right-radius: 15px;
+    -webkit-border-bottom-left-radius: 15px;
 }
 
 #qunit-tests .fail                          { color: #000000; background-color: #EE5757; }
@@ -208,18 +208,18 @@
 /** Result */
 
 #qunit-testresult {
-	padding: 0.5em 0.5em 0.5em 2.5em;
+    padding: 0.5em 0.5em 0.5em 2.5em;
 
-	color: #2b81af;
-	background-color: #D2E0E6;
+    color: #2b81af;
+    background-color: #D2E0E6;
 
-	border-bottom: 1px solid white;
+    border-bottom: 1px solid white;
 }
 
 /** Fixture */
 
 #qunit-fixture {
-	position: absolute;
-	top: -10000px;
-	left: -10000px;
+    position: absolute;
+    top: -10000px;
+    left: -10000px;
 }