Skip to content
This repository has been archived by the owner on Feb 19, 2022. It is now read-only.

Commit

Permalink
Upgrade jQuery, work around ie9 Sauce issues.
Browse files Browse the repository at this point in the history
  • Loading branch information
ryan-roemer committed Oct 19, 2014
1 parent a2a253a commit 2cf6a6b
Show file tree
Hide file tree
Showing 5 changed files with 5,438 additions and 5,072 deletions.
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"mocha": "1.13.0",
"sinon": "http://sinonjs.org/releases/sinon-1.7.3.js",
"chai": "1.8.1",
"jquery": "2.0.3",
"jquery": "2.1.1",
"requirejs": "2.1.9",
"pure": "0.3.0"
}
Expand Down
10 changes: 5 additions & 5 deletions chai-jq.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,15 @@
* Give a more useful element name.
*/
var _elName = function ($el) {
var name = "",
id = $el.attr("id"),
cls = $el.attr("class") || "";

// Detect if completely empty.
if (!$el || $el.length === 0) {
return "<EMPTY OBJECT>";
}

var name = "",
id = $el.attr("id"),
cls = $el.attr("class") || "";

// Try CSS selector id.
if (id) {
name += "#" + id;
Expand Down Expand Up @@ -253,7 +253,7 @@
var $val = _jqAssert(function (exp) {
// Manually check empty elements for `.val` call b/c ie9 can otherwise
// report `Unspecified error.` at least in Sauce Labs.
var act = this._$el.length > 0 ? this._$el.val() : undefined,
var act = this._$el && this._$el.length > 0 ? this._$el.val() : undefined,
comp = _isRegExp(exp) ? _regExpMatch : _equals;

this.assert(
Expand Down
2 changes: 1 addition & 1 deletion gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,7 @@ gulp.task("copy", function () {
"bower_components/mocha/mocha.js",
"bower_components/mocha/mocha.css",
"bower_components/chai/chai.js",
"bower_components/jquery/jquery.js",
"bower_components/jquery/dist/jquery.js",
"bower_components/requirejs/require.js",
"bower_components/pure/pure-min.css"
])
Expand Down
Loading

0 comments on commit 2cf6a6b

Please sign in to comment.