Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

[DE PE SSE mobile] Fix bug 42818

Browse source
This commit is contained in:
JuliaSvinareva 2020-03-26 17:28:54 +03:00
parent d3cc8c9976
commit fa6bafaec4
9 changed files with 49 additions and 55 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
apps/documenteditor/mobile/app/view/Search.js
View file

@ -144,7 +144,11 @@ define([
searchBar = $$('.searchbar.document'); searchBar = $$('.searchbar.document');
if (searchBar.length < 1) { if (searchBar.length < 1) {
$(me.el).find('.pages .page').first().prepend(_layout.find('#search-panel-view').html()); $(_layout.find('#search-panel-view').html()).insertAfter($(me.el).find('.pages'));
if ($('.logo-navbar').length > 0) {
$('.searchbar.document').css('margin-top', '27px');
}
//$(me.el).find('.pages .page').first().prepend(_layout.find('#search-panel-view').html());
// Show replace mode if needed // Show replace mode if needed
var isReplace = Common.SharedSettings.get('search-is-replace'); var isReplace = Common.SharedSettings.get('search-is-replace');
@ -160,15 +164,10 @@ define([
$('.navbar-through .page > .searchbar').css('top', top); $('.navbar-through .page > .searchbar').css('top', top);
} }
_.defer(function() { uiApp.showNavbar(searchBar);
uiApp.showNavbar(searchBar); if (!searchBar.hasClass('navbar-hidden')) {
$('.searchbar.search input').focus();
searchBar.transitionEnd(function () { }
if (!searchBar.hasClass('navbar-hidden')) {
$('.searchbar.search input').focus();
}
});
}, 10);
} }
}, },
@ -182,14 +181,10 @@ define([
return; return;
} }
_.defer(function() { me.fireEvent('searchbar:hide', me);
searchBar.transitionEnd(function () { searchBar.remove();
me.fireEvent('searchbar:hide', me); uiApp.hideNavbar(searchBar);
searchBar.remove();
});
uiApp.hideNavbar(searchBar);
}, 10);
} }
}, },

2
apps/documenteditor/mobile/resources/css/app-ios.css
View file

@ -6616,7 +6616,7 @@ html.pixel-ratio-3 .document-menu .list-block li:last-child li .item-inner:after
display: none; display: none;
} }
.searchbar.document { .searchbar.document {
background: #e4e4e6; background-color: #f7f7f8;
} }
i.icon.icon-logo { i.icon.icon-logo {
width: 100px; width: 100px;

3
apps/documenteditor/mobile/resources/less/ios/_search.less
View file

@ -117,5 +117,6 @@
} }
.searchbar.document { .searchbar.document {
background: lighten(@searchbarBg, 10%); //background: lighten(@searchbarBg, 10%);
background-color: #f7f7f8;
} }

31
apps/presentationeditor/mobile/app/view/Search.js
View file

@ -144,7 +144,11 @@ define([
searchBar = $$('.searchbar.document'); searchBar = $$('.searchbar.document');
if (searchBar.length < 1) { if (searchBar.length < 1) {
$(me.el).find('.pages .page').first().prepend(_layout.find('#search-panel-view').html()); $(_layout.find('#search-panel-view').html()).insertAfter($(me.el).find('.pages'));
if ($('.logo-navbar').length > 0) {
$('.searchbar.document').css('margin-top', '27px');
}
//$(me.el).find('.pages .page').first().prepend(_layout.find('#search-panel-view').html());
// Show replace mode if needed // Show replace mode if needed
var isReplace = Common.SharedSettings.get('search-is-replace'); var isReplace = Common.SharedSettings.get('search-is-replace');
@ -160,15 +164,14 @@ define([
$('.navbar-through .page > .searchbar').css('top', top); $('.navbar-through .page > .searchbar').css('top', top);
} }
_.defer(function() {
uiApp.showNavbar(searchBar);
searchBar.transitionEnd(function () { uiApp.showNavbar(searchBar);
if (!searchBar.hasClass('navbar-hidden')) {
$('.searchbar.search input').focus(); if (!searchBar.hasClass('navbar-hidden')) {
} $('.searchbar.search input').focus();
}); }
}, 10);
} }
}, },
@ -182,14 +185,10 @@ define([
return; return;
} }
_.defer(function() { me.fireEvent('searchbar:hide', me);
searchBar.transitionEnd(function () { searchBar.remove();
me.fireEvent('searchbar:hide', me); uiApp.hideNavbar(searchBar);
searchBar.remove();
});
uiApp.hideNavbar(searchBar);
}, 10);
} }
}, },

2
apps/presentationeditor/mobile/resources/css/app-ios.css
View file

@ -6612,7 +6612,7 @@ html.pixel-ratio-3 .document-menu .list-block li:last-child li .item-inner:after
display: none; display: none;
} }
.searchbar.document { .searchbar.document {
background: #e4e4e6; background-color: #f7f7f8;
} }
i.icon.icon-logo { i.icon.icon-logo {
width: 100px; width: 100px;

3
apps/presentationeditor/mobile/resources/less/ios/_search.less
View file

@ -112,5 +112,6 @@
} }
.searchbar.document { .searchbar.document {
background: lighten(@searchbarBg, 10%); //background: lighten(@searchbarBg, 10%);
background-color: #f7f7f8;
} }

29
apps/spreadsheeteditor/mobile/app/view/Search.js
View file

@ -145,7 +145,12 @@ define([
if (searchBar.length < 1) { if (searchBar.length < 1) {
$(_layout.find('#search-panel-view').html()).insertAfter($(me.el).find('#cell-editing-box')); $(_layout.find('#search-panel-view').html()).insertAfter($(me.el).find('.pages'));
if ($('.logo-navbar').length > 0) {
$('.searchbar.document').css('margin-top', '26px');
}
//$(_layout.find('#search-panel-view').html()).insertAfter($(me.el).find('#cell-editing-box'));
// $(me.el).find('.pages .page').prepend(_layout.find('#search-panel-view').html()); // $(me.el).find('.pages .page').prepend(_layout.find('#search-panel-view').html());
// Show replace mode if needed // Show replace mode if needed
@ -175,15 +180,12 @@ define([
$('.navbar-through .page > .searchbar').css('top', top); $('.navbar-through .page > .searchbar').css('top', top);
} }
_.defer(function() {
uiApp.showNavbar(searchBar); uiApp.showNavbar(searchBar);
searchBar.transitionEnd(function () { if (!searchBar.hasClass('navbar-hidden')) {
if (!searchBar.hasClass('navbar-hidden')) { $('.searchbar.search input').focus();
$('.searchbar.search input').focus(); }
}
});
}, 10);
} }
}, },
@ -197,14 +199,9 @@ define([
return; return;
} }
_.defer(function() { me.fireEvent('searchbar:hide', me);
searchBar.transitionEnd(function () { searchBar.remove();
me.fireEvent('searchbar:hide', me); uiApp.hideNavbar(searchBar);
searchBar.remove();
});
uiApp.hideNavbar(searchBar);
}, 10);
} }
this.fireEvent('search:highlight', [this, false]); this.fireEvent('search:highlight', [this, false]);

2
apps/spreadsheeteditor/mobile/resources/css/app-ios.css
View file

@ -7416,7 +7416,7 @@ html.pixel-ratio-3 .box-tabs ul > li:after {
display: none; display: none;
} }
.searchbar.document { .searchbar.document {
background: #e4e4e6; background-color: #f7f7f8;
} }
.logo-navbar { .logo-navbar {
height: 68px; height: 68px;

3
apps/spreadsheeteditor/mobile/resources/less/ios/_search.less
View file

@ -117,5 +117,6 @@
} }
.searchbar.document { .searchbar.document {
background: lighten(@searchbarBg, 10%); //background: lighten(@searchbarBg, 10%);
background-color: #f7f7f8;
} }