Return-Path: X-Original-To: apmail-couchdb-commits-archive@www.apache.org Delivered-To: apmail-couchdb-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 231AE10056 for ; Fri, 7 Mar 2014 00:19:17 +0000 (UTC) Received: (qmail 37733 invoked by uid 500); 7 Mar 2014 00:18:02 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 37187 invoked by uid 500); 7 Mar 2014 00:17:50 -0000 Mailing-List: contact commits-help@couchdb.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@couchdb.apache.org Delivered-To: mailing list commits@couchdb.apache.org Received: (qmail 36999 invoked by uid 99); 7 Mar 2014 00:17:46 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 07 Mar 2014 00:17:46 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id EA99593A25C; Fri, 7 Mar 2014 00:17:45 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: dch@apache.org To: commits@couchdb.apache.org Date: Fri, 07 Mar 2014 00:18:20 -0000 Message-Id: <092791d23cf34cebad0e5dd74857b1a7@git.apache.org> In-Reply-To: <9b6ec795d075458aa14b487352cd8036@git.apache.org> References: <9b6ec795d075458aa14b487352cd8036@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [37/50] [abbrv] couchdb commit: updated refs/heads/2041-update-ibrowse to 948e7d9 Remove editor reference to go to line 2 to stop browsers from crashing on people who have minified index functions. Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/e0b860d0 Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/e0b860d0 Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/e0b860d0 Branch: refs/heads/2041-update-ibrowse Commit: e0b860d0f1e024c1fd691a643dc65a4aa5d302c1 Parents: 17a9763 Author: suelockwood Authored: Tue Feb 25 14:58:26 2014 -0500 Committer: suelockwood Committed: Tue Feb 25 14:58:36 2014 -0500 ---------------------------------------------------------------------- src/fauxton/app/addons/fauxton/components.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb/blob/e0b860d0/src/fauxton/app/addons/fauxton/components.js ---------------------------------------------------------------------- diff --git a/src/fauxton/app/addons/fauxton/components.js b/src/fauxton/app/addons/fauxton/components.js index 8b21916..39c213d 100644 --- a/src/fauxton/app/addons/fauxton/components.js +++ b/src/fauxton/app/addons/fauxton/components.js @@ -284,11 +284,11 @@ function(app, FauxtonAPI, ace, spin) { afterRender: function () { this.editor = ace.edit(this.editorId); this.setHeightToLineCount(); + this.editor.getSession().setUseWorker(false); this.editor.setTheme("ace/theme/" + this.theme); + this.editor.getSession().setMode("ace/mode/" + this.mode); - this.editor.getSession().setUseWrapMode(true); this.editor.setShowPrintMargin(false); - this.editor.gotoLine(2); this.addCommands(); if (this.couchJSHINT) { @@ -329,7 +329,8 @@ function(app, FauxtonAPI, ace, spin) { }, getLines: function(){ - return this.editor.getSession().getDocument().getLength(); + return 5; + // return this.editor.getSession().getDocument().getLength(); }, addCommands: function () {