[SSE mobile] Add Search by rows/by columns
This commit is contained in:
Julia Svinareva
parent
5a009e4c90
commit
ca34b2f594
|
|
@ -170,9 +170,11 @@ define([
|
|||
isMatchCase = Common.SharedSettings.get('search-match-case') === true,
|
||||
isMatchCell = Common.SharedSettings.get('search-match-cell') === true,
|
||||
isHighlightRes = Common.SharedSettings.get('search-highlight-res') === true,
|
||||
searchBy = Common.SharedSettings.get('search-by') === 'rows' ? 'rows' : 'columns',
|
||||
$pageSettings = $('.page[data-page=search-settings]'),
|
||||
$inputType = $pageSettings.find('input[name=search-type]'),
|
||||
$inputSearchIn = $pageSettings.find('input[name=search-in]'),
|
||||
$inputSearchBy = $pageSettings.find('input[name=search-by]'),
|
||||
$inputMatchCase = $pageSettings.find('#search-match-case input:checkbox'),
|
||||
$inputMatchCell = $pageSettings.find('#search-match-cell input:checkbox'),
|
||||
$inputHighlightResults = $pageSettings.find('#search-highlight-res input:checkbox');
|
||||
|
|
@ -182,10 +184,12 @@ define([
|
|||
$inputMatchCase.prop('checked', isMatchCase);
|
||||
$inputMatchCell.prop('checked', isMatchCell);
|
||||
$inputHighlightResults.prop('checked', isHighlightRes);
|
||||
$inputSearchBy.val([searchBy]);
|
||||
|
||||
// init events
|
||||
$inputType.single('change', _.bind(me.onTypeChange, me));
|
||||
$inputSearchIn.single('change', _.bind(me.onSearchInChange, me));
|
||||
$inputSearchBy.single('change', _.bind(me.onSearchByChange, me));
|
||||
$inputMatchCase.single('change', _.bind(me.onMatchCaseClick, me));
|
||||
$inputMatchCell.single('change', _.bind(me.onMatchCellClick, me));
|
||||
$inputHighlightResults.single('change', _.bind(me.onHighlightResultsClick, me));
|
||||
|
|
@ -278,7 +282,8 @@ define([
|
|||
onQuerySearch: function(query, direction) {
|
||||
var matchCase = Common.SharedSettings.get('search-match-case') || false,
|
||||
matchCell = Common.SharedSettings.get('search-match-cell') || false,
|
||||
lookInSheet = Common.SharedSettings.get('search-in') === 'sheet';
|
||||
lookInSheet = Common.SharedSettings.get('search-in') === 'sheet',
|
||||
searchBy = Common.SharedSettings.get('search-by') === 'rows';
|
||||
|
||||
if (query && query.length) {
|
||||
var options = new Asc.asc_CFindOptions();
|
||||
|
|
@ -287,7 +292,7 @@ define([
|
|||
options.asc_setIsMatchCase(matchCase);
|
||||
options.asc_setIsWholeCell(matchCell);
|
||||
options.asc_setScanOnOnlySheet(lookInSheet);
|
||||
// options.asc_setScanByRows(this.dlgSearch.menuSearch.menu.items[0].checked);
|
||||
options.asc_setScanByRows(searchBy);
|
||||
// options.asc_setLookIn(this.dlgSearch.menuLookin.menu.items[0].checked?Asc.c_oAscFindLookIn.Formulas:Asc.c_oAscFindLookIn.Value);
|
||||
|
||||
if (!this.api.asc_findText(options)) {
|
||||
|
|
@ -307,7 +312,8 @@ define([
|
|||
onQueryReplace: function(search, replace) {
|
||||
var matchCase = Common.SharedSettings.get('search-match-case') || false,
|
||||
matchCell = Common.SharedSettings.get('search-match-cell') || false,
|
||||
lookInSheet = Common.SharedSettings.get('search-in') === 'sheet';
|
||||
lookInSheet = Common.SharedSettings.get('search-in') === 'sheet',
|
||||
searchBy = Common.SharedSettings.get('search-by') === 'rows';
|
||||
|
||||
if (search && search.length) {
|
||||
this.api.isReplaceAll = false;
|
||||
|
|
@ -318,7 +324,7 @@ define([
|
|||
options.asc_setIsMatchCase(matchCase);
|
||||
options.asc_setIsWholeCell(matchCell);
|
||||
options.asc_setScanOnOnlySheet(lookInSheet);
|
||||
// options.asc_setScanByRows(this.dlgSearch.menuSearch.menu.items[0].checked);
|
||||
options.asc_setScanByRows(searchBy);
|
||||
// options.asc_setLookIn(this.dlgSearch.menuLookin.menu.items[0].checked?Asc.c_oAscFindLookIn.Formulas:Asc.c_oAscFindLookIn.Value);
|
||||
options.asc_setIsReplaceAll(false);
|
||||
|
||||
|
|
@ -329,7 +335,8 @@ define([
|
|||
onQueryReplaceAll: function(search, replace) {
|
||||
var matchCase = Common.SharedSettings.get('search-match-case') || false,
|
||||
matchCell = Common.SharedSettings.get('search-match-cell') || false,
|
||||
lookInSheet = Common.SharedSettings.get('search-in') === 'sheet';
|
||||
lookInSheet = Common.SharedSettings.get('search-in') === 'sheet',
|
||||
searchBy = Common.SharedSettings.get('search-by') === 'rows';
|
||||
|
||||
if (search && search.length) {
|
||||
this.api.isReplaceAll = true;
|
||||
|
|
@ -340,7 +347,7 @@ define([
|
|||
options.asc_setIsMatchCase(matchCase);
|
||||
options.asc_setIsWholeCell(matchCell);
|
||||
options.asc_setScanOnOnlySheet(lookInSheet);
|
||||
// options.asc_setScanByRows(this.dlgSearch.menuSearch.menu.items[0].checked);
|
||||
options.asc_setScanByRows(searchBy);
|
||||
// options.asc_setLookIn(this.dlgSearch.menuLookin.menu.items[0].checked?Asc.c_oAscFindLookIn.Formulas:Asc.c_oAscFindLookIn.Value);
|
||||
options.asc_setIsReplaceAll(true);
|
||||
|
||||
|
|
@ -360,6 +367,10 @@ define([
|
|||
Common.SharedSettings.set('search-in', $(e.currentTarget).val());
|
||||
},
|
||||
|
||||
onSearchByChange: function(e) {
|
||||
Common.SharedSettings.set('search-by', $(e.currentTarget).val());
|
||||
},
|
||||
|
||||
onMatchCaseClick: function (e) {
|
||||
Common.SharedSettings.set('search-match-case', $(e.currentTarget).is(':checked'));
|
||||
},
|
||||
|
|
|
|||
|
|
@ -95,6 +95,29 @@
|
|||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
<div class="content-block-title"><%= scope.textSearchBy %></div>
|
||||
<div class="list-block">
|
||||
<ul>
|
||||
<li>
|
||||
<label class="label-radio item-content">
|
||||
<input type="radio" name="search-by" value="rows">
|
||||
<% if (android) { %><div class="item-media"><i class="icon icon-form-radio"></i></div><% } %>
|
||||
<div class="item-inner">
|
||||
<div class="item-title"><%= scope.textByRows %></div>
|
||||
</div>
|
||||
</label>
|
||||
</li>
|
||||
<li>
|
||||
<label class="label-radio item-content">
|
||||
<input type="radio" name="search-by" value="columns">
|
||||
<% if (android) { %><div class="item-media"><i class="icon icon-form-radio"></i></div><% } %>
|
||||
<div class="item-inner">
|
||||
<div class="item-title"><%= scope.textByColumns %></div>
|
||||
</div>
|
||||
</label>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
<div class="list-block">
|
||||
<ul>
|
||||
<li>
|
||||
|
|
|
|||
|
|
@ -161,6 +161,9 @@ define([
|
|||
if (Common.SharedSettings.get('search-highlight-res')) {
|
||||
this.fireEvent('search:highlight', [this, true]);
|
||||
}
|
||||
if(Common.SharedSettings.get('search-by') === undefined) {
|
||||
Common.SharedSettings.set('search-by', 'rows');
|
||||
}
|
||||
|
||||
searchBar = $$('.searchbar.document');
|
||||
|
||||
|
|
@ -209,7 +212,10 @@ define([
|
|||
textSearchIn: 'Search In',
|
||||
textWorkbook: 'Workbook',
|
||||
textSheet: 'Sheet',
|
||||
textHighlightRes: 'Highlight results'
|
||||
textHighlightRes: 'Highlight results',
|
||||
textByColumns: 'By columns',
|
||||
textByRows: 'By rows',
|
||||
textSearchBy: 'Search'
|
||||
}
|
||||
})(), SSE.Views.Search || {}))
|
||||
});
|
||||
Loading…
Reference in a new issue