Permalink
Browse files

whitespace

  • Loading branch information...
madrobby committed Feb 28, 2012
1 parent a3d20bf commit 433df876dfc9ca30ad14bb2153be684b3d4b7d7f
Showing with 5 additions and 5 deletions.
  1. +3 −3 README.md
  2. +2 −2 src/ajax.js
View
@@ -396,11 +396,11 @@ Zepto tests are written using Evidence.js and can be found
in the `test` folder. See https://github.com/tobie/Evidence for more info on Evidence.
Simply add your tests (see existing tests as templates) and then view the HTML file in a browser).
-For detailed results, see the JavaScript console in your browser.
+For detailed results, see the JavaScript console in your browser.
_There's experimental support for automatically running tests on the command line and integrating them
-with a continuous integration server, using the `jasmine-headless-webkit` Rubygem, which in turnrequires
-Qt to be installed and a `CI` environment variable set (you can then run `bundle` to install the
+with a continuous integration server, using the `jasmine-headless-webkit` Rubygem, which in turnrequires
+Qt to be installed and a `CI` environment variable set (you can then run `bundle` to install the
required dependencies and run `rake test` to run the tests). (This is not for the faint of heart and
right now is experimental only, so don't blame us if you can't get it to work!)_
View
@@ -7,7 +7,8 @@
isObject = $.isObject,
document = window.document,
key,
- name;
+ name,
+ rscript = /<script\b[^<]*(?:(?!<\/script>)<[^<]*)*<\/script>/gi;
// trigger a custom event and return false if it was cancelled
function triggerAndReturn(context, eventName, data) {
@@ -379,7 +380,6 @@
var self = this, parts = url.split(/\s/), selector;
if (parts.length > 1) url = parts[0], selector = parts[1];
$.get(url, function(response){
- var rscript = /<script\b[^<]*(?:(?!<\/script>)<[^<]*)*<\/script>/gi;
self.html(selector ?
$(document.createElement('div')).html(response.replace(rscript, "")).find(selector).html()
: response);

0 comments on commit 433df87

Please sign in to comment.