vendor/assets/javascripts/codemirror/utils/search.js in codemirror-rails-2.32 vs vendor/assets/javascripts/codemirror/utils/search.js in codemirror-rails-2.33

- old
+ new

@@ -38,11 +38,11 @@ dialog(cm, queryDialog, "Search for:", function(query) { cm.operation(function() { if (!query || state.query) return; state.query = parseQuery(query); if (cm.lineCount() < 2000) { // This is too expensive on big documents. - for (var cursor = getSearchCursor(cm, query); cursor.findNext();) + for (var cursor = getSearchCursor(cm, state.query); cursor.findNext();) state.marked.push(cm.markText(cursor.from(), cursor.to(), "CodeMirror-searching")); } state.posFrom = state.posTo = cm.getCursor(); findNext(cm, rev); }); @@ -55,18 +55,18 @@ cursor = getSearchCursor(cm, state.query, rev ? {line: cm.lineCount() - 1} : {line: 0, ch: 0}); if (!cursor.find(rev)) return; } cm.setSelection(cursor.from(), cursor.to()); state.posFrom = cursor.from(); state.posTo = cursor.to(); - })} + });} function clearSearch(cm) {cm.operation(function() { var state = getSearchState(cm); if (!state.query) return; state.query = null; for (var i = 0; i < state.marked.length; ++i) state.marked[i].clear(); state.marked.length = 0; - })} + });} var replaceQueryDialog = 'Replace: <input type="text" style="width: 10em"/> <span style="color: #888">(Use /re/ syntax for regexp search)</span>'; var replacementQueryDialog = 'With: <input type="text" style="width: 10em"/>'; var doReplaceConfirm = "Replace? <button>Yes</button> <button>No</button> <button>Stop</button>"; @@ -81,10 +81,10 @@ if (typeof query != "string") { var match = cm.getRange(cursor.from(), cursor.to()).match(query); cursor.replace(text.replace(/\$(\d)/, function(w, i) {return match[i];})); } else cursor.replace(text); } - })}); + });}); } else { clearSearch(cm); var cursor = getSearchCursor(cm, query, cm.getCursor()); function advance() { var start = cursor.from(), match;