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

Fix merge

Browse source
This commit is contained in:
Julia Radzhabova 2021-12-07 23:45:12 +03:00
parent b4e3a2dfa9
commit afe26fc355
7 changed files with 35 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
apps/common/main/lib/component/DataView.js
View file

@ -299,7 +299,8 @@ define([
this.cmpEl = $(this.template({ this.cmpEl = $(this.template({
groups: me.groups ? me.groups.toJSON() : null, groups: me.groups ? me.groups.toJSON() : null,
style: me.style, style: me.style,
cls: me.cls cls: me.cls,
options: me.options
})); }));
parentEl.html(this.cmpEl); parentEl.html(this.cmpEl);
@ -308,7 +309,8 @@ define([
this.cmpEl.html(this.template({ this.cmpEl.html(this.template({
groups: me.groups ? me.groups.toJSON() : null, groups: me.groups ? me.groups.toJSON() : null,
style: me.style, style: me.style,
cls: me.cls cls: me.cls,
options: me.options
})); }));
} }
@ -506,7 +508,8 @@ define([
$(this.el).html(this.template({ $(this.el).html(this.template({
groups: this.groups ? this.groups.toJSON() : null, groups: this.groups ? this.groups.toJSON() : null,
style: this.style, style: this.style,
cls: this.cls cls: this.cls,
options: this.options
})); }));
if (!_.isUndefined(this.scroller)) { if (!_.isUndefined(this.scroller)) {

2
apps/common/main/lib/component/ListView.js
View file

@ -59,7 +59,7 @@ define([
}, },
template: _.template([ 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('')), ].join('')),
onResetItems : function() { onResetItems : function() {

1
apps/documenteditor/main/index.html.deploy
View file

@ -230,6 +230,7 @@
</script> </script>
<link rel="stylesheet" type="text/css" href="../../../apps/documenteditor/main/resources/css/app.css"> <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> </head>
<body> <body>
<script src="../../../../../apps/common/main/lib/util/htmlutils.js?__inline=true"></script> <script src="../../../../../apps/common/main/lib/util/htmlutils.js?__inline=true"></script>

1
apps/presentationeditor/main/index.html.deploy
View file

@ -264,6 +264,7 @@
</script> </script>
<link rel="stylesheet" type="text/css" href="../../../apps/presentationeditor/main/resources/css/app.css"> <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> </head>
<body> <body>
<script src="../../../../../apps/common/main/lib/util/htmlutils.js?__inline=true"></script> <script src="../../../../../apps/common/main/lib/util/htmlutils.js?__inline=true"></script>

31
apps/spreadsheeteditor/main/app/view/Spellcheck.js
View file

@ -60,7 +60,7 @@ define([
'<div id="spellcheck-suggestions-list"></div>', '<div id="spellcheck-suggestions-list"></div>',
'<div id="spellcheck-change" style=""></div>', '<div id="spellcheck-change" style=""></div>',
'<div id="spellcheck-ignore" class="padding-large"></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>', '<label class="header" style="display: block;"><%= scope.txtDictionaryLanguage %></label>',
'<div id="spellcheck-dictionary-language"></div>', '<div id="spellcheck-dictionary-language"></div>',
'<div id="spellcheck-complete" class="hidden">', '<div id="spellcheck-complete" class="hidden">',
@ -84,7 +84,10 @@ define([
el : $('#spellcheck-current-word'), el : $('#spellcheck-current-word'),
allowBlank : true, allowBlank : true,
validateOnBlur: false, validateOnBlur: false,
disabled: true disabled: true,
dataHint: '1',
dataHintDirection: 'left',
dataHintOffset: 'big'
}); });
this.buttonNext = new Common.UI.Button({ this.buttonNext = new Common.UI.Button({
@ -92,14 +95,19 @@ define([
style: 'margin-left: 5px;', style: 'margin-left: 5px;',
cls: 'btn-toolbar bg-white', cls: 'btn-toolbar bg-white',
iconCls: 'toolbar__icon btn-nextitem', iconCls: 'toolbar__icon btn-nextitem',
hint: this.txtNextTip hint: this.txtNextTip,
dataHint: '1',
dataHintDirection: 'top'
}); });
this.suggestionList = new Common.UI.ListView({ this.suggestionList = new Common.UI.ListView({
el: $('#spellcheck-suggestions-list'), el: $('#spellcheck-suggestions-list'),
emptyText: this.noSuggestions, emptyText: this.noSuggestions,
store: new Common.UI.DataViewStore(), store: new Common.UI.DataViewStore(),
scrollAlwaysVisible: true scrollAlwaysVisible: true,
dataHint: '1',
dataHintDirection: 'left',
dataHintOffset: 'big'
}); });
this.btnChange = new Common.UI.Button({ this.btnChange = new Common.UI.Button({
@ -121,7 +129,10 @@ define([
value: 1 value: 1
} }
] ]
}) }),
dataHint: '1',
dataHintDirection: 'bottom',
dataHintOffset: 'big'
}); });
this.btnIgnore = new Common.UI.Button({ this.btnIgnore = new Common.UI.Button({
@ -143,7 +154,10 @@ define([
value: 1 value: 1
} }
] ]
}) }),
dataHint: '1',
dataHintDirection: 'bottom',
dataHintOffset: 'big'
}); });
this.cmbDictionaryLanguage = new Common.UI.ComboBox({ this.cmbDictionaryLanguage = new Common.UI.ComboBox({
@ -155,7 +169,10 @@ define([
scroller : { scroller : {
suppressScrollX: true suppressScrollX: true
}, },
search: true search: true,
dataHint: '1',
dataHintDirection: 'bottom',
dataHintOffset: 'big'
}); });
this.btnToDictionary = new Common.UI.Button({ this.btnToDictionary = new Common.UI.Button({

1
apps/spreadsheeteditor/main/index.html.deploy
View file

@ -265,6 +265,7 @@
<link rel="stylesheet" type="text/css" href="../../../../sdkjs/cell/css/main.css"/> <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"> <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> </head>
<body> <body>
<script src="../../../../../apps/common/main/lib/util/htmlutils.js?__inline=true"></script> <script src="../../../../../apps/common/main/lib/util/htmlutils.js?__inline=true"></script>

1
apps/spreadsheeteditor/main/index_internal.html.deploy
View file

@ -189,6 +189,7 @@
<link rel="stylesheet" type="text/css" href="../../../../sdkjs/cell/css/main.css"/> <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"> <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> </head>
<body> <body>
<script src="../../../../../apps/common/main/lib/util/htmlutils.js?__inline=true"></script> <script src="../../../../../apps/common/main/lib/util/htmlutils.js?__inline=true"></script>