Merge branch 'master' of https://github.com/kembuco/ICanHaz.js into k…

…embuco-master
joelvh · Nov 11, 2010 · b8a62ba · b8a62ba
2 parents 7442b95 + 4dcf3b7
commit b8a62ba
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/ICanHaz.js b/ICanHaz.js
@@ -66,7 +66,7 @@ var ich;
         $('script[type="text/html"]').each(function () {
             var script = $(this),
                 name = script.attr('id'),
-                text = script.html().trim(),
+                text = $.trim(script.html()),
                 isPartial = script.attr('class').toLowerCase() === 'partial';
 
             if (isPartial) {

diff --git a/test/test.html b/test/test.html
@@ -6,7 +6,7 @@
         <script src="../mustache.js"></script>
         <link rel="stylesheet" href="qunit/qunit.css" type="text/css" media="screen" />
         <script type="text/javascript" src="qunit/qunit.js"></script>
-        <script type="text/javascript" src="../ICanHaz.min.js"></script>
+        <script type="text/javascript" src="../ICanHaz.js"></script>
         <script type="text/javascript" src="./ich_test.js"></script>
 
         <!-- Testing templates -->