Skip to content

Replaced 'Search and Replace' with 'Find and Replace' #497

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 28, 2015
Merged

Replaced 'Search and Replace' with 'Find and Replace' #497

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e93db3e
Replaced 'Search and Replace' with 'Find and Replace'
captainsafia Sep 25, 2015
e8fd942
Renamed search and replace div ID
captainsafia Sep 26, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion notebook/static/notebook/js/menubar.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ define([
});

var id_actions_dict = {
'#search_and_replace' : 'ipython.search-and-replace-dialog',
'#find_and_replace' : 'ipython.find-and-replace-dialog',
'#save_checkpoint': 'ipython.save-notebook',
'#restart_kernel': 'ipython.restart-kernel',
'#int_kernel': 'ipython.interrupt-kernel',
Expand Down
12 changes: 6 additions & 6 deletions notebook/static/notebook/js/searchandreplace.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ define(function(require){
var snr = function(env, event) {
var search = $("<input/>")
.addClass('form-control')
.attr('placeholder','Search');
.attr('placeholder','Find');
var isRegExpButton = $('<button/>')
.attr('type', 'button')
.attr('id', 'isreg')
Expand Down Expand Up @@ -182,7 +182,7 @@ define(function(require){
var body = $('<div/>')
.attr('id', 'replace-preview');
var form = $('<form/>')
.attr('id', 'search-and-replace')
.attr('id', 'find-and-replace')
.append($('<div/>').addClass('form-group')
.append(
$('<div/>').addClass('input-group')
Expand Down Expand Up @@ -346,7 +346,7 @@ define(function(require){

var mod = dialog.modal({
show: false,
title: "Search and Replace",
title: "Find and Replace",
body:form,
keyboard_manager: env.notebook.keyboard_manager,
buttons:{
Expand All @@ -371,16 +371,16 @@ define(function(require){

var load = function(keyboard_manager){
var action_all = {
help: 'search and replace',
help: 'find and replace',
handler: function(env, event){
snr(env, event);
}
};

var act_all = keyboard_manager.actions.register(action_all, 'search-and-replace-dialog', 'ipython');
var act_all = keyboard_manager.actions.register(action_all, 'find-and-replace-dialog', 'ipython');

keyboard_manager.command_shortcuts.add_shortcuts({
'f': 'ipython.search-and-replace-dialog'
'f': 'ipython.find-and-replace-dialog'
});
};

Expand Down
2 changes: 1 addition & 1 deletion notebook/static/notebook/less/searchandreplace.less
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

#search-and-replace {
#find-and-replace {
#replace-preview .match, #replace-preview .insert{
background-color:lightblue;
border-color: darken(lightblue, 20%);
Expand Down
2 changes: 1 addition & 1 deletion notebook/templates/notebook.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@
<li class="divider"></li>
<li id="edit_nb_metadata"><a href="#">Edit Notebook Metadata</a></li>
<li class="divider"></li>
<li id="search_and_replace"><a href="#"> Search and Replace </a></li>
<li id="find_and_replace"><a href="#"> Find and Replace </a></li>
</ul>
</li>
<li class="dropdown"><a href="#" class="dropdown-toggle" data-toggle="dropdown">View</a>
Expand Down