From d11d66136d728f61c89fb96fc6ed9d34ed57cff2 Mon Sep 17 00:00:00 2001 From: Narciso Jaramillo Date: Tue, 5 Jun 2012 18:38:47 -0700 Subject: [PATCH 1/2] Updated to work with merged CodeMirror for sprint 10 --- src/editor/Editor.js | 2 +- src/styles/brackets_codemirror_override.less | 4 ++-- src/thirdparty/CodeMirror2 | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/editor/Editor.js b/src/editor/Editor.js index d8a96b69680..f5ff28eae27 100644 --- a/src/editor/Editor.js +++ b/src/editor/Editor.js @@ -907,7 +907,7 @@ define(function (require, exports, module) { /** Returns true if the editor has focus */ Editor.prototype.hasFocus = function () { // The CodeMirror instance wrapper has a "CodeMirror-focused" class set when focused - return $(this.getRootElement()).hasClass("CodeMirror-focused"); + return $(this.getScrollerElement()).hasClass("CodeMirror-focused"); }; /** diff --git a/src/styles/brackets_codemirror_override.less b/src/styles/brackets_codemirror_override.less index 1d6b9f948d0..cc2a27dc50b 100644 --- a/src/styles/brackets_codemirror_override.less +++ b/src/styles/brackets_codemirror_override.less @@ -112,14 +112,14 @@ .CodeMirror pre.CodeMirror-cursor { visibility: hidden; } - .CodeMirror.CodeMirror-focused pre.CodeMirror-cursor { + .CodeMirror .CodeMirror-focused pre.CodeMirror-cursor { visibility: visible; } .CodeMirror div.CodeMirror-selected { background: #d9d9d9; } - .CodeMirror.CodeMirror-focused div.CodeMirror-selected { + .CodeMirror .CodeMirror-focused div.CodeMirror-selected { background: #d2dcf8; } .CodeMirror .CodeMirror-gutter { diff --git a/src/thirdparty/CodeMirror2 b/src/thirdparty/CodeMirror2 index ea75addd490..818d5394764 160000 --- a/src/thirdparty/CodeMirror2 +++ b/src/thirdparty/CodeMirror2 @@ -1 +1 @@ -Subproject commit ea75addd4905706438ec1305044f24f13e6b8842 +Subproject commit 818d539476453f561357f746bf5db9b6562824d6 From 8ed79a66df75737e72b0a5ad2cdd1f36d80eed13 Mon Sep 17 00:00:00 2001 From: Narciso Jaramillo Date: Wed, 6 Jun 2012 10:23:11 -0700 Subject: [PATCH 2/2] Update SHA to reference latest CM merge --- src/thirdparty/CodeMirror2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/thirdparty/CodeMirror2 b/src/thirdparty/CodeMirror2 index 818d5394764..6e82bddcec3 160000 --- a/src/thirdparty/CodeMirror2 +++ b/src/thirdparty/CodeMirror2 @@ -1 +1 @@ -Subproject commit 818d539476453f561357f746bf5db9b6562824d6 +Subproject commit 6e82bddcec3df4f52e9b5debe44d8859f8407d3b