mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-04-21 07:56:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix iFrame issue where console is set to top. and change to window.

Browse source
This commit is contained in:
John McLear 2011-03-26 19:47:31 +00:00
parent 82f427422a
commit b26b1ebf15
1 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
static/js/ace2_inner.js
View file

@ -73,8 +73,8 @@ function OUTER(gscope) {
var iframePadTop = EDIT_BODY_PADDING_TOP; var iframePadTop = EDIT_BODY_PADDING_TOP;
var iframePadBottom = 0, iframePadRight = 0; var iframePadBottom = 0, iframePadRight = 0;
var console = (DEBUG && top.console); var console = (DEBUG && window.console);
if (! console) { if (! window.console) {
var names = ["log", "debug", "info", "warn", "error", "assert", "dir", "dirxml", var names = ["log", "debug", "info", "warn", "error", "assert", "dir", "dirxml",
"group", "groupEnd", "time", "timeEnd", "count", "trace", "profile", "profileEnd"]; "group", "groupEnd", "time", "timeEnd", "count", "trace", "profile", "profileEnd"];
console = {}; console = {};
@ -82,6 +82,7 @@ function OUTER(gscope) {
console[names[i]] = function() {}; console[names[i]] = function() {};
//console.error = function(str) { alert(str); }; //console.error = function(str) { alert(str); };
} }
var PROFILER = window.PROFILER; var PROFILER = window.PROFILER;
if (!PROFILER) { if (!PROFILER) {
PROFILER = function() { return {start:noop, mark:noop, literal:noop, end:noop, cancel:noop}; }; PROFILER = function() { return {start:noop, mark:noop, literal:noop, end:noop, cancel:noop}; };
@ -1311,7 +1312,7 @@ function OUTER(gscope) {
isTimeUp = (isTimeUp || function() { return false; }); isTimeUp = (isTimeUp || function() { return false; });
if (DEBUG && top.DONT_INCORP || window.DEBUG_DONT_INCORP) return false; if (DEBUG && window.DONT_INCORP || window.DEBUG_DONT_INCORP) return false;
var p = PROFILER("incorp", false); var p = PROFILER("incorp", false);