Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[BUGFIX beta] String.prototype.trim does not exist on IE8. #10734

Merged
merged 1 commit into from
Mar 26, 2015
Merged

[BUGFIX beta] String.prototype.trim does not exist on IE8. #10734

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 8 additions & 7 deletions packages/ember/tests/routing/basic_test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import ActionManager from "ember-views/system/action_manager";
import EmberHandlebars from "ember-htmlbars/compat";

var compile = EmberHandlebars.compile;
var trim = Ember.$.trim;

var Router, App, router, registry, container, originalLoggerError;

Expand Down Expand Up @@ -3671,13 +3672,13 @@ QUnit.test("Tolerates stacked renders", function() {
}
});
bootApplication();
equal(Ember.$('#qunit-fixture').text().trim(), 'hi');
equal(trim(Ember.$('#qunit-fixture').text()), 'hi');
Ember.run(router, 'send', 'openLayer');
equal(Ember.$('#qunit-fixture').text().trim(), 'hilayer');
equal(trim(Ember.$('#qunit-fixture').text()), 'hilayer');
Ember.run(router, 'send', 'openLayer');
equal(Ember.$('#qunit-fixture').text().trim(), 'hilayer');
equal(trim(Ember.$('#qunit-fixture').text()), 'hilayer');
Ember.run(router, 'send', 'close');
equal(Ember.$('#qunit-fixture').text().trim(), 'hi');
equal(trim(Ember.$('#qunit-fixture').text()), 'hi');
});

QUnit.test("Renders child into parent with non-default template name", function() {
Expand Down Expand Up @@ -3732,11 +3733,11 @@ QUnit.test("Allows any route to disconnectOutlet another route's templates", fun
}
});
bootApplication();
equal(Ember.$('#qunit-fixture').text().trim(), 'hi');
equal(trim(Ember.$('#qunit-fixture').text()), 'hi');
Ember.run(router, 'send', 'openLayer');
equal(Ember.$('#qunit-fixture').text().trim(), 'hilayer');
equal(trim(Ember.$('#qunit-fixture').text()), 'hilayer');
Ember.run(router, 'send', 'close');
equal(Ember.$('#qunit-fixture').text().trim(), 'hi');
equal(trim(Ember.$('#qunit-fixture').text()), 'hi');
});

QUnit.test("Can render({into:...}) the render helper", function() {
Expand Down