Fix merge
This commit is contained in:
Julia Radzhabova
parent
b4e3a2dfa9
commit
afe26fc355
|
|
@ -299,7 +299,8 @@ define([
|
|||
this.cmpEl = $(this.template({
|
||||
groups: me.groups ? me.groups.toJSON() : null,
|
||||
style: me.style,
|
||||
cls: me.cls
|
||||
cls: me.cls,
|
||||
options: me.options
|
||||
}));
|
||||
|
||||
parentEl.html(this.cmpEl);
|
||||
|
|
@ -308,7 +309,8 @@ define([
|
|||
this.cmpEl.html(this.template({
|
||||
groups: me.groups ? me.groups.toJSON() : null,
|
||||
style: me.style,
|
||||
cls: me.cls
|
||||
cls: me.cls,
|
||||
options: me.options
|
||||
}));
|
||||
}
|
||||
|
||||
|
|
@ -506,7 +508,8 @@ define([
|
|||
$(this.el).html(this.template({
|
||||
groups: this.groups ? this.groups.toJSON() : null,
|
||||
style: this.style,
|
||||
cls: this.cls
|
||||
cls: this.cls,
|
||||
options: this.options
|
||||
}));
|
||||
|
||||
if (!_.isUndefined(this.scroller)) {
|
||||
|
|
|
|||
|
|
@ -59,7 +59,7 @@ define([
|
|||
},
|
||||
|
||||
template: _.template([
|
||||
'<div class="listview inner <%= cls %>"></div>'
|
||||
'<div class="listview inner <%= cls %>" <% if (options.dataHint) { %> data-hint="<%= options.dataHint %>" <% } if (options.dataHintDirection) { %> data-hint-direction="<%= options.dataHintDirection %>" <% } if (options.dataHintOffset) { %> data-hint-offset="<%= options.dataHintOffset %>" <% } %>></div>'
|
||||
].join('')),
|
||||
|
||||
onResetItems : function() {
|
||||
|
|
|
|||
|
|
@ -230,6 +230,7 @@
|
|||
</script>
|
||||
|
||||
<link rel="stylesheet" type="text/css" href="../../../apps/documenteditor/main/resources/css/app.css">
|
||||
<script src="../../../../../apps/common/main/lib/util/themeinit.js?__inline=true"></script>
|
||||
</head>
|
||||
<body>
|
||||
<script src="../../../../../apps/common/main/lib/util/htmlutils.js?__inline=true"></script>
|
||||
|
|
|
|||
|
|
@ -264,6 +264,7 @@
|
|||
</script>
|
||||
|
||||
<link rel="stylesheet" type="text/css" href="../../../apps/presentationeditor/main/resources/css/app.css">
|
||||
<script src="../../../../../apps/common/main/lib/util/themeinit.js?__inline=true"></script>
|
||||
</head>
|
||||
<body>
|
||||
<script src="../../../../../apps/common/main/lib/util/htmlutils.js?__inline=true"></script>
|
||||
|
|
|
|||
|
|
@ -60,7 +60,7 @@ define([
|
|||
'<div id="spellcheck-suggestions-list"></div>',
|
||||
'<div id="spellcheck-change" style=""></div>',
|
||||
'<div id="spellcheck-ignore" class="padding-large"></div>',
|
||||
'<button class="btn btn-text-default auto" id="spellcheck-add-to-dictionary"><%= scope.txtAddToDictionary %></button>',
|
||||
'<button class="btn btn-text-default auto" id="spellcheck-add-to-dictionary" data-hint="1" data-hint-direction="bottom" data-hint-offset="big"><%= scope.txtAddToDictionary %></button>',
|
||||
'<label class="header" style="display: block;"><%= scope.txtDictionaryLanguage %></label>',
|
||||
'<div id="spellcheck-dictionary-language"></div>',
|
||||
'<div id="spellcheck-complete" class="hidden">',
|
||||
|
|
@ -84,7 +84,10 @@ define([
|
|||
el : $('#spellcheck-current-word'),
|
||||
allowBlank : true,
|
||||
validateOnBlur: false,
|
||||
disabled: true
|
||||
disabled: true,
|
||||
dataHint: '1',
|
||||
dataHintDirection: 'left',
|
||||
dataHintOffset: 'big'
|
||||
});
|
||||
|
||||
this.buttonNext = new Common.UI.Button({
|
||||
|
|
@ -92,14 +95,19 @@ define([
|
|||
style: 'margin-left: 5px;',
|
||||
cls: 'btn-toolbar bg-white',
|
||||
iconCls: 'toolbar__icon btn-nextitem',
|
||||
hint: this.txtNextTip
|
||||
hint: this.txtNextTip,
|
||||
dataHint: '1',
|
||||
dataHintDirection: 'top'
|
||||
});
|
||||
|
||||
this.suggestionList = new Common.UI.ListView({
|
||||
el: $('#spellcheck-suggestions-list'),
|
||||
emptyText: this.noSuggestions,
|
||||
store: new Common.UI.DataViewStore(),
|
||||
scrollAlwaysVisible: true
|
||||
scrollAlwaysVisible: true,
|
||||
dataHint: '1',
|
||||
dataHintDirection: 'left',
|
||||
dataHintOffset: 'big'
|
||||
});
|
||||
|
||||
this.btnChange = new Common.UI.Button({
|
||||
|
|
@ -121,7 +129,10 @@ define([
|
|||
value: 1
|
||||
}
|
||||
]
|
||||
})
|
||||
}),
|
||||
dataHint: '1',
|
||||
dataHintDirection: 'bottom',
|
||||
dataHintOffset: 'big'
|
||||
});
|
||||
|
||||
this.btnIgnore = new Common.UI.Button({
|
||||
|
|
@ -143,7 +154,10 @@ define([
|
|||
value: 1
|
||||
}
|
||||
]
|
||||
})
|
||||
}),
|
||||
dataHint: '1',
|
||||
dataHintDirection: 'bottom',
|
||||
dataHintOffset: 'big'
|
||||
});
|
||||
|
||||
this.cmbDictionaryLanguage = new Common.UI.ComboBox({
|
||||
|
|
@ -155,7 +169,10 @@ define([
|
|||
scroller : {
|
||||
suppressScrollX: true
|
||||
},
|
||||
search: true
|
||||
search: true,
|
||||
dataHint: '1',
|
||||
dataHintDirection: 'bottom',
|
||||
dataHintOffset: 'big'
|
||||
});
|
||||
|
||||
this.btnToDictionary = new Common.UI.Button({
|
||||
|
|
|
|||
|
|
@ -265,6 +265,7 @@
|
|||
|
||||
<link rel="stylesheet" type="text/css" href="../../../../sdkjs/cell/css/main.css"/>
|
||||
<link rel="stylesheet" type="text/css" href="../../../apps/spreadsheeteditor/main/resources/css/app.css">
|
||||
<script src="../../../../../apps/common/main/lib/util/themeinit.js?__inline=true"></script>
|
||||
</head>
|
||||
<body>
|
||||
<script src="../../../../../apps/common/main/lib/util/htmlutils.js?__inline=true"></script>
|
||||
|
|
|
|||
|
|
@ -189,6 +189,7 @@
|
|||
|
||||
<link rel="stylesheet" type="text/css" href="../../../../sdkjs/cell/css/main.css"/>
|
||||
<link rel="stylesheet" type="text/css" href="../../../apps/spreadsheeteditor/main/resources/css/app.css">
|
||||
<script src="../../../../../apps/common/main/lib/util/themeinit.js?__inline=true"></script>
|
||||
</head>
|
||||
<body>
|
||||
<script src="../../../../../apps/common/main/lib/util/htmlutils.js?__inline=true"></script>
|
||||
|
|
|
|||
Loading…
Reference in a new issue