[DE PE SSE] Fix alt-hints in search panel
This commit is contained in:
parent
e57fed6bc8
commit
b5ade7b338
|
@ -444,6 +444,9 @@ define([
|
||||||
'class="form-control <%= cls %>" ',
|
'class="form-control <%= cls %>" ',
|
||||||
'placeholder="<%= placeHolder %>" ',
|
'placeholder="<%= placeHolder %>" ',
|
||||||
'value="<%= value %>"',
|
'value="<%= value %>"',
|
||||||
|
'data-hint="<%= dataHint %>"',
|
||||||
|
'data-hint-offset="<%= dataHintOffset %>"',
|
||||||
|
'data-hint-direction="<%= dataHintDirection %>"',
|
||||||
'>',
|
'>',
|
||||||
'<span class="input-error"></span>',
|
'<span class="input-error"></span>',
|
||||||
'<div class="select-button">' +
|
'<div class="select-button">' +
|
||||||
|
@ -466,7 +469,10 @@ define([
|
||||||
placeHolder : this.placeHolder,
|
placeHolder : this.placeHolder,
|
||||||
spellcheck : this.spellcheck,
|
spellcheck : this.spellcheck,
|
||||||
iconCls : this.options.iconCls,
|
iconCls : this.options.iconCls,
|
||||||
scope : me
|
scope : me,
|
||||||
|
dataHint : this.options.dataHint,
|
||||||
|
dataHintOffset: this.options.dataHintOffset,
|
||||||
|
dataHintDirection: this.options.dataHintDirection
|
||||||
}));
|
}));
|
||||||
|
|
||||||
if (parentEl) {
|
if (parentEl) {
|
||||||
|
|
|
@ -31,7 +31,7 @@
|
||||||
</tr>
|
</tr>
|
||||||
<tr class="search-options-block">
|
<tr class="search-options-block">
|
||||||
<td class="padding-large">
|
<td class="padding-large">
|
||||||
<div id="open-search-options">
|
<div id="open-search-options" data-hint="1" data-hint-direction="left" data-hint-offset="0, -15">
|
||||||
<div class="search-options-caret img-commonctrl"></div>
|
<div class="search-options-caret img-commonctrl"></div>
|
||||||
<div class="search-options-txt"><%= scope.textSearchOptions %></div>
|
<div class="search-options-txt"><%= scope.textSearchOptions %></div>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -70,7 +70,10 @@ define([
|
||||||
placeHolder: this.textFind,
|
placeHolder: this.textFind,
|
||||||
allowBlank: true,
|
allowBlank: true,
|
||||||
validateOnBlur: false,
|
validateOnBlur: false,
|
||||||
style: 'width: 100%;'
|
style: 'width: 100%;',
|
||||||
|
dataHint: '1',
|
||||||
|
dataHintDirection: 'left',
|
||||||
|
dataHintOffset: 'small'
|
||||||
});
|
});
|
||||||
this.inputText._input.on('input', _.bind(function () {
|
this.inputText._input.on('input', _.bind(function () {
|
||||||
this.fireEvent('search:input', [this.inputText._input.val()]);
|
this.fireEvent('search:input', [this.inputText._input.val()]);
|
||||||
|
@ -83,7 +86,10 @@ define([
|
||||||
placeHolder: this.textReplaceWith,
|
placeHolder: this.textReplaceWith,
|
||||||
allowBlank: true,
|
allowBlank: true,
|
||||||
validateOnBlur: false,
|
validateOnBlur: false,
|
||||||
style: 'width: 100%;'
|
style: 'width: 100%;',
|
||||||
|
dataHint: '1',
|
||||||
|
dataHintDirection: 'left',
|
||||||
|
dataHintOffset: 'small'
|
||||||
});
|
});
|
||||||
|
|
||||||
this.btnBack = new Common.UI.Button({
|
this.btnBack = new Common.UI.Button({
|
||||||
|
@ -155,7 +161,10 @@ define([
|
||||||
parentEl: $('#search-btn-close', this.$el),
|
parentEl: $('#search-btn-close', this.$el),
|
||||||
cls: 'btn-toolbar',
|
cls: 'btn-toolbar',
|
||||||
iconCls: 'toolbar__icon btn-close',
|
iconCls: 'toolbar__icon btn-close',
|
||||||
hint: this.textCloseSearch
|
hint: this.textCloseSearch,
|
||||||
|
dataHint: '1',
|
||||||
|
dataHintDirection: 'bottom',
|
||||||
|
dataHintOffset: 'medium'
|
||||||
});
|
});
|
||||||
this.buttonClose.on('click', _.bind(this.onClickClosePanel, this));
|
this.buttonClose.on('click', _.bind(this.onClickClosePanel, this));
|
||||||
|
|
||||||
|
@ -174,7 +183,10 @@ define([
|
||||||
{ value: 0, displayValue: this.textSheet },
|
{ value: 0, displayValue: this.textSheet },
|
||||||
{ value: 1, displayValue: this.textWorkbook },
|
{ value: 1, displayValue: this.textWorkbook },
|
||||||
{ value: 2, displayValue: this.textSpecificRange}
|
{ value: 2, displayValue: this.textSpecificRange}
|
||||||
]
|
],
|
||||||
|
dataHint: '1',
|
||||||
|
dataHintDirection: 'bottom',
|
||||||
|
dataHintOffset: 'big'
|
||||||
}).on('selected', function(combo, record) {
|
}).on('selected', function(combo, record) {
|
||||||
me.fireEvent('search:options', ['within', record.value]);
|
me.fireEvent('search:options', ['within', record.value]);
|
||||||
});
|
});
|
||||||
|
@ -186,7 +198,10 @@ define([
|
||||||
validateOnChange: true,
|
validateOnChange: true,
|
||||||
validateOnBlur: true,
|
validateOnBlur: true,
|
||||||
style: "width: 219px; margin-top: 8px",
|
style: "width: 219px; margin-top: 8px",
|
||||||
disabled: true
|
disabled: true,
|
||||||
|
dataHint: '1',
|
||||||
|
dataHintDirection: 'left',
|
||||||
|
dataHintOffset: 'small'
|
||||||
}).on('keyup:after', function(input, e) {
|
}).on('keyup:after', function(input, e) {
|
||||||
me.fireEvent('search:options', ['range', input.getValue(), e.keyCode !== Common.UI.Keys.RETURN]);
|
me.fireEvent('search:options', ['range', input.getValue(), e.keyCode !== Common.UI.Keys.RETURN]);
|
||||||
});
|
});
|
||||||
|
@ -200,10 +215,11 @@ define([
|
||||||
data: [
|
data: [
|
||||||
{ value: 0, displayValue: this.textByRows },
|
{ value: 0, displayValue: this.textByRows },
|
||||||
{ value: 1, displayValue: this.textByColumns }
|
{ value: 1, displayValue: this.textByColumns }
|
||||||
]
|
],
|
||||||
|
dataHint: '1',
|
||||||
|
dataHintDirection: 'bottom',
|
||||||
|
dataHintOffset: 'big'
|
||||||
}).on('selected', function(combo, record) {
|
}).on('selected', function(combo, record) {
|
||||||
console.log(record.value);
|
|
||||||
console.log(!record.value);
|
|
||||||
me.fireEvent('search:options', ['search', !record.value]);
|
me.fireEvent('search:options', ['search', !record.value]);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
@ -216,10 +232,11 @@ define([
|
||||||
data: [
|
data: [
|
||||||
{ value: 0, displayValue: this.textFormulas },
|
{ value: 0, displayValue: this.textFormulas },
|
||||||
{ value: 1, displayValue: this.textValues }
|
{ value: 1, displayValue: this.textValues }
|
||||||
]
|
],
|
||||||
|
dataHint: '1',
|
||||||
|
dataHintDirection: 'bottom',
|
||||||
|
dataHintOffset: 'big'
|
||||||
}).on('selected', function(combo, record) {
|
}).on('selected', function(combo, record) {
|
||||||
console.log(record.value);
|
|
||||||
console.log(!record.value);
|
|
||||||
me.fireEvent('search:options', ['lookIn', !record.value]);
|
me.fireEvent('search:options', ['lookIn', !record.value]);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
<div id="view-left-menu" class="tool-menu left">
|
<div id="view-left-menu" class="tool-menu left">
|
||||||
<div class="tool-menu-btns">
|
<div class="tool-menu-btns">
|
||||||
<button id="left-btn-searchbar" class="btn btn-category" data-hint="0" data-hint-direction="right" data-hint-offset="big" content-target=""><i class="icon toolbar__icon btn-menu-search"> </i></button>
|
<button id="left-btn-searchbar" class="btn btn-category" data-hint="0" data-hint-direction="right" data-hint-offset="big" content-target="left-panel-search"><i class="icon toolbar__icon btn-menu-search"> </i></button>
|
||||||
<!-- /** coauthoring begin **/ -->
|
<!-- /** coauthoring begin **/ -->
|
||||||
<button id="left-btn-comments" class="btn btn-category" data-hint="0" data-hint-direction="right" data-hint-offset="big" content-target="left-panel-comments"><i class="icon toolbar__icon btn-menu-comments"> </i></button>
|
<button id="left-btn-comments" class="btn btn-category" data-hint="0" data-hint-direction="right" data-hint-offset="big" content-target="left-panel-comments"><i class="icon toolbar__icon btn-menu-comments"> </i></button>
|
||||||
<button id="left-btn-chat" class="btn btn-category" data-hint="0" data-hint-direction="right" data-hint-offset="big" content-target="left-panel-chat"><i class="icon toolbar__icon btn-menu-chat"> </i></button>
|
<button id="left-btn-chat" class="btn btn-category" data-hint="0" data-hint-direction="right" data-hint-offset="big" content-target="left-panel-chat"><i class="icon toolbar__icon btn-menu-chat"> </i></button>
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
<div id="view-left-menu" class="tool-menu left">
|
<div id="view-left-menu" class="tool-menu left">
|
||||||
<div class="tool-menu-btns">
|
<div class="tool-menu-btns">
|
||||||
<button id="left-btn-searchbar" class="btn btn-category" data-hint="0" data-hint-direction="right" data-hint-offset="big" content-target=""><i class="icon toolbar__icon btn-menu-search"> </i></button>
|
<button id="left-btn-searchbar" class="btn btn-category" data-hint="0" data-hint-direction="right" data-hint-offset="big" content-target="left-panel-search"><i class="icon toolbar__icon btn-menu-search"> </i></button>
|
||||||
<button id="left-btn-thumbs" class="btn btn-category" data-hint="0" data-hint-direction="right" data-hint-offset="big" content-target=""><i class="icon toolbar__icon btn-menu-thumbs"> </i></button>
|
<button id="left-btn-thumbs" class="btn btn-category" data-hint="0" data-hint-direction="right" data-hint-offset="big" content-target=""><i class="icon toolbar__icon btn-menu-thumbs"> </i></button>
|
||||||
<!-- /** coauthoring begin **/ -->
|
<!-- /** coauthoring begin **/ -->
|
||||||
<button id="left-btn-comments" class="btn btn-category" data-hint="0" data-hint-direction="right" data-hint-offset="big" content-target="left-panel-comments"><i class="icon toolbar__icon btn-menu-comments"> </i></button>
|
<button id="left-btn-comments" class="btn btn-category" data-hint="0" data-hint-direction="right" data-hint-offset="big" content-target="left-panel-comments"><i class="icon toolbar__icon btn-menu-comments"> </i></button>
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
<div id="view-left-menu" class="tool-menu left">
|
<div id="view-left-menu" class="tool-menu left">
|
||||||
<div class="tool-menu-btns">
|
<div class="tool-menu-btns">
|
||||||
<button id="left-btn-searchbar" class="btn btn-category" data-hint="0" data-hint-direction="right" data-hint-offset="big" content-target=""><i class="icon toolbar__icon btn-menu-search"> </i></button>
|
<button id="left-btn-searchbar" class="btn btn-category" data-hint="0" data-hint-direction="right" data-hint-offset="big" content-target="left-panel-search"><i class="icon toolbar__icon btn-menu-search"> </i></button>
|
||||||
<!-- /** coauthoring begin **/ -->
|
<!-- /** coauthoring begin **/ -->
|
||||||
<button id="left-btn-comments" class="btn btn-category" content-target="left-panel-comments" data-hint="0" data-hint-direction="right" data-hint-offset="big"><i class="icon toolbar__icon btn-menu-comments"> </i></button>
|
<button id="left-btn-comments" class="btn btn-category" content-target="left-panel-comments" data-hint="0" data-hint-direction="right" data-hint-offset="big"><i class="icon toolbar__icon btn-menu-comments"> </i></button>
|
||||||
<button id="left-btn-chat" class="btn btn-category" content-target="left-panel-chat" data-hint="0" data-hint-direction="right" data-hint-offset="big"><i class="icon toolbar__icon btn-menu-chat"> </i></button>
|
<button id="left-btn-chat" class="btn btn-category" content-target="left-panel-chat" data-hint="0" data-hint-direction="right" data-hint-offset="big"><i class="icon toolbar__icon btn-menu-chat"> </i></button>
|
||||||
|
|
Loading…
Reference in a new issue