git://git.webkit.org / WebKit-https.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 11a5866)
DYEBench: Ember.js assertion hit at line 20593
authorrniwa@webkit.org <rniwa@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sun, 1 Jun 2014 07:01:52 +0000 (07:01 +0000)
committerrniwa@webkit.org <rniwa@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sun, 1 Jun 2014 07:01:52 +0000 (07:01 +0000)
https://bugs.webkit.org/show_bug.cgi?id=133431

Reviewed by Darin Adler.

The assertion was hit because ToDoMVC includes jQuery 2.1 and Ember.js 1.3.1 only recognizes jQuery 2.0.
Port the assertion from Ember.js 1.5.1 to suppress the assertion.

We should update the entire Ember.js at some point but this would do the job for now.

* DoYouEvenBench/Full.html:
* DoYouEvenBench/resources/todomvc/architecture-examples/emberjs/bower_components/ember/ember.js:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@169513 268f45cc-cd09-0410-ab3c-d52691b4dbfc

PerformanceTests/ChangeLog patch | blob | history
PerformanceTests/DoYouEvenBench/Full.html patch | blob | history
PerformanceTests/DoYouEvenBench/resources/todomvc/architecture-examples/emberjs/bower_components/ember/ember.js patch | blob | history

diff --git a/PerformanceTests/ChangeLog b/PerformanceTests/ChangeLog
index bdb6577299738e55c8d3c0eab8978fc104e749f4..eba3e9026f0e155f3c83765b3e84c18271c0aa1c 100644 (file)
--- a/PerformanceTests/ChangeLog
+++ b/PerformanceTests/ChangeLog
@@ -1,3 +1,18 @@
+2014-05-31  Ryosuke Niwa  <rniwa@webkit.org>
+
+        DYEBench: Ember.js assertion hit at line 20593
+        https://bugs.webkit.org/show_bug.cgi?id=133431
+
+        Reviewed by Darin Adler.
+
+        The assertion was hit because ToDoMVC includes jQuery 2.1 and Ember.js 1.3.1 only recognizes jQuery 2.0.
+        Port the assertion from Ember.js 1.5.1 to suppress the assertion.
+
+        We should update the entire Ember.js at some point but this would do the job for now.
+
+        * DoYouEvenBench/Full.html:
+        * DoYouEvenBench/resources/todomvc/architecture-examples/emberjs/bower_components/ember/ember.js:
+
 2014-05-31  Ryosuke Niwa  <rniwa@webkit.org>
 
         DYEBench: Prevent frame flattening on iOS
diff --git a/PerformanceTests/DoYouEvenBench/Full.html b/PerformanceTests/DoYouEvenBench/Full.html
index e0a7057fb44ca6c7926f68385046cbb2134adb9e..9a9d396bef2e364f8c8f5340245d71dc3fc75878 100644 (file)
--- a/PerformanceTests/DoYouEvenBench/Full.html
+++ b/PerformanceTests/DoYouEvenBench/Full.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-<title>DoYouEvenBench v0.13</title>
+<title>DoYouEvenBench v0.14</title>
 <style type="text/css">
 caption { margin: 0; padding: 0; font-family: sans-serif; font-size: 1em; font-weight: bold; white-space: nowrap; }
 #progressContainer { padding: 605px 0 10px 0; width: 800px; }
diff --git a/PerformanceTests/DoYouEvenBench/resources/todomvc/architecture-examples/emberjs/bower_components/ember/ember.js b/PerformanceTests/DoYouEvenBench/resources/todomvc/architecture-examples/emberjs/bower_components/ember/ember.js
index dc4bb500d9d286074d3321e989c77a82a72bf1da..a556711a8c8661d6e844bd60d1ea2cbf272785c7 100644 (file)
--- a/PerformanceTests/DoYouEvenBench/resources/todomvc/architecture-examples/emberjs/bower_components/ember/ember.js
+++ b/PerformanceTests/DoYouEvenBench/resources/todomvc/architecture-examples/emberjs/bower_components/ember/ember.js
@@ -20590,7 +20590,7 @@ if (!jQuery && typeof require === 'function') {
   jQuery = require('jquery');
 }
 
-Ember.assert("Ember Views require jQuery 1.7, 1.8, 1.9, 1.10, or 2.0", jQuery && (jQuery().jquery.match(/^((1\.(7|8|9|10))|2.0)(\.\d+)?(pre|rc\d?)?/) || Ember.ENV.FORCE_JQUERY));
+Ember.assert("Ember Views require jQuery between 1.7 and 2.1", jQuery && (jQuery().jquery.match(/^((1\.(7|8|9|10|11))|(2\.(0|1)))(\.\d+)?(pre|rc\d?)?/) || Ember.ENV.FORCE_JQUERY));
 
 /**
   Alias for jQuery
Mirror of the WebKit open source project from svn.webkit.org.