Permalink
Browse files

Merge remote-tracking branch 'origin/master' into randy/live-dev-ut

  • Loading branch information...
2 parents 57fb5a0 + 2550c37 commit 520ccf6e4473587db5a027ff36bf2b4f617b40bb @redmunds redmunds committed Mar 14, 2013
Showing with 14 additions and 8 deletions.
  1. +1 −1 src/nls/fr/strings.js
  2. +1 −1 src/nls/ja/strings.js
  3. +8 −6 src/search/FindReplace.js
  4. +4 −0 src/styles/brackets_codemirror_override.less
View
@@ -202,7 +202,7 @@ define({
"CMD_BLOCK_COMMENT": "Commenter les blocs/Annuler les commentaires",
"CMD_LINE_UP": "Déplacer la ligne vers le haut",
"CMD_LINE_DOWN": "Déplacer la ligne vers le bas",
- "CMD_TOGGLE_CLOSE_BRACKETS": "[6734352] !é=Enable Close Brackets=!",
+ "CMD_TOGGLE_CLOSE_BRACKETS": "[6734352] !é=Auto Close Braces=!",
// View menu commands
"VIEW_MENU": "Affichage",
View
@@ -202,7 +202,7 @@ define({
"CMD_BLOCK_COMMENT": "ブロックコメントの切り替え",
"CMD_LINE_UP": "行を上に移動",
"CMD_LINE_DOWN": "行を下に移動",
- "CMD_TOGGLE_CLOSE_BRACKETS": "!能=[6734352] Enable Close Brackets_=!",
+ "CMD_TOGGLE_CLOSE_BRACKETS": "!能=[6734352] Auto Close Braces_=!",
// View menu commands
"VIEW_MENU": "表示",
View
@@ -113,9 +113,11 @@ define(function (require, exports, module) {
return found;
}
- function clearHighlights(state) {
- state.marked.forEach(function (markedRange) {
- markedRange.clear();
+ function clearHighlights(cm, state) {
+ cm.operation(function () {
+ state.marked.forEach(function (markedRange) {
+ markedRange.clear();
+ });
});
state.marked.length = 0;
}
@@ -128,7 +130,7 @@ define(function (require, exports, module) {
}
state.query = null;
- clearHighlights(state);
+ clearHighlights(cm, state);
});
}
@@ -176,7 +178,7 @@ define(function (require, exports, module) {
isFindFirst = true;
cm.operation(function () {
if (state.query) {
- clearHighlights(getSearchState(cm));
+ clearHighlights(cm, state);
}
state.query = parseQuery(query);
if (!state.query) {
@@ -244,7 +246,7 @@ define(function (require, exports, module) {
});
$(modalBar).on("closeOk closeCancel closeBlur", function (e, query) {
// Clear highlights but leave search state in place so Find Next/Previous work after closing
- clearHighlights(state);
+ clearHighlights(cm, state);
// As soon as focus goes back to the editor, restore normal selection color
$(cm.getWrapperElement()).removeClass("find-highlighting");
@@ -132,6 +132,10 @@
other than a vanilla .CodeMirror)
*/
.CodeMirror {
+ .CodeMirror {
+ background: transparent;
+ }
+
.CodeMirror span.CodeMirror-matchingbracket {
/* Ensure visibility against gray inline editor background */
background-color: @background-color-1;

0 comments on commit 520ccf6

Please sign in to comment.