diff --git a/lib/jasmine-html.js b/lib/jasmine-html.js index 5c9698ac..81402b9c 100644 --- a/lib/jasmine-html.js +++ b/lib/jasmine-html.js @@ -162,7 +162,13 @@ jasmine.TrivialReporter.prototype.reportSpecResults = function(spec) { jasmine.TrivialReporter.prototype.log = function() { var console = jasmine.getGlobal().console; - if (console && console.log) console.log.apply(console, arguments); + if (console && console.log) { + if (console.log.apply) { + console.log.apply(console, arguments); + } else { + console.log(arguments); // ie fix: console.log.apply doesn't exist on ie + } + } }; jasmine.TrivialReporter.prototype.getLocation = function() { diff --git a/lib/jasmine.js b/lib/jasmine.js index 68baf534..964f99ed 100644 --- a/lib/jasmine.js +++ b/lib/jasmine.js @@ -2416,6 +2416,6 @@ jasmine.getGlobal().clearInterval = function(timeoutKey) { jasmine.version_= { "major": 1, "minor": 0, - "build": 0, - "revision": 1284494074 + "build": 1, + "revision": 1286311016 }; diff --git a/pages b/pages index 9ef77246..366a658e 160000 --- a/pages +++ b/pages @@ -1 +1 @@ -Subproject commit 9ef772465fe1af3d1a75a7bd30558594686f02cc +Subproject commit 366a658e43843956e5bb08f07337193d75c71487 diff --git a/src/version.json b/src/version.json index 63604ba7..a4a5a3d8 100644 --- a/src/version.json +++ b/src/version.json @@ -1,5 +1,5 @@ { "major": 1, "minor": 0, - "build": 0 + "build": 1 }