[Libreoffice-commits] online.git: loleaflet/src loleaflet/typescript_js
Szymon KÅ‚os (via logerrit)
logerrit at kemper.freedesktop.org
Fri Jul 3 10:27:37 UTC 2020
loleaflet/src/control/Control.NotebookbarBuilder.js | 6
loleaflet/typescript_js/admin/src/ModalDialogCreator.js | 118 ++++++++++++++++
2 files changed, 121 insertions(+), 3 deletions(-)
New commits:
commit e8f5fa6fd6ef9a8358d35acd14c4a7d6d9af8126
Author: Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Fri Jul 3 10:20:05 2020 +0200
Commit: Szymon Kłos <szymon.klos at collabora.com>
CommitDate: Fri Jul 3 12:27:18 2020 +0200
notebookbar: fix font size combobox
Change-Id: I492ff580d76746666ada3de8e2bcf188d46486be
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/97818
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
Reviewed-by: Szymon Kłos <szymon.klos at collabora.com>
diff --git a/loleaflet/src/control/Control.NotebookbarBuilder.js b/loleaflet/src/control/Control.NotebookbarBuilder.js
index dc00ace4b..27857a375 100644
--- a/loleaflet/src/control/Control.NotebookbarBuilder.js
+++ b/loleaflet/src/control/Control.NotebookbarBuilder.js
@@ -143,6 +143,7 @@ L.Control.NotebookbarBuilder = L.Control.JSDialogBuilder.extend({
$('#fontnamecombobox').val(state).trigger('change');
} else if (commandName === '.uno:FontHeight') {
$('#fontsize').val(parseFloat(state)).trigger('change');
+ $('#fontsizecombobox').val(parseFloat(state)).trigger('change');
} else if (commandName === '.uno:StyleApply') {
$('#applystyle').val(state).trigger('change');
}
@@ -161,7 +162,7 @@ L.Control.NotebookbarBuilder = L.Control.JSDialogBuilder.extend({
var state = items.getItemValue('.uno:CharFontName');
$(combobox).val(state).trigger('change');
}
- else if (id === 'fontsize') {
+ else if (id === 'fontsize' || id === 'fontsizecombobox') {
$(combobox).on('select2:select', function (e) {
builder.map.applyFontSize(parseFloat(e.params.data.text));
builder.map.focus();
@@ -209,13 +210,12 @@ L.Control.NotebookbarBuilder = L.Control.JSDialogBuilder.extend({
data.entries.forEach(function (value, index) {
var selected = parseInt(data.selectedEntries[0]) == index;
var id = index;
- if (data.id === 'fontsize')
+ if (data.id === 'fontsize' || data.id === 'fontsizecombobox')
id = parseFloat(value);
if (data.id === 'fontnamecombobox')
id = value;
processedData.push({id: id, text: value, selected: selected});
});
- console.log(processedData);
$(select).select2({
data: processedData,
diff --git a/loleaflet/typescript_js/admin/src/ModalDialogCreator.js b/loleaflet/typescript_js/admin/src/ModalDialogCreator.js
new file mode 100644
index 000000000..ca76adcea
--- /dev/null
+++ b/loleaflet/typescript_js/admin/src/ModalDialogCreator.js
@@ -0,0 +1,118 @@
+/* eslint-disable */
+/// Available types: info, warning, danger, link, success, primary. Works with bulma.css.
+// Every "set" function returns the instance. So you can do this:
+// (new DlgYesNo).Title('some title').Text('some text').YesButtonText('yes').NoButtonText('no').YesFunction(function () {/* */}).NoFunction(function() {/** */});
+// "Yes" and "No" buttons call callback function, close the modal and destroy the modal.
+var DlgYesNo = /** @class */ (function () {
+ function DlgYesNo() {
+ this._instance = this;
+ DlgYesNo._instanceCount++;
+ this._modalID = DlgYesNo._instanceCount;
+ this.initialize();
+ }
+ DlgYesNo.prototype.initialize = function () {
+ var html = this.getModalHTML();
+ var element = document.createElement('div');
+ element.innerHTML = html;
+ document.getElementsByTagName('body')[0].appendChild(element);
+ this.initializeBackgroundClick();
+ this.initializeCrossButton();
+ this.initializeYesButton();
+ this.initializeNoButton();
+ };
+ DlgYesNo.prototype.initializeCrossButton = function () {
+ var element = document.getElementById('modal-' + String(this._modalID));
+ document.getElementById('modal-cross-button-' + String(this._modalID)).onclick = function () {
+ element.classList.remove('is-active');
+ element.parentNode.removeChild(element);
+ };
+ };
+ DlgYesNo.prototype.initializeBackgroundClick = function () {
+ var element = document.getElementById('modal-' + String(this._modalID));
+ document.getElementById('modal-background-' + String(this._modalID)).onclick = function () {
+ element.classList.remove('is-active');
+ element.parentNode.removeChild(element);
+ };
+ };
+ DlgYesNo.prototype.initializeYesButton = function () {
+ var element = document.getElementById('modal-' + String(this._modalID));
+ document.getElementById('modal-yes-button-' + String(this._modalID)).onclick = function () {
+ element.classList.remove('is-active');
+ element.parentNode.removeChild(element);
+ };
+ };
+ DlgYesNo.prototype.initializeNoButton = function () {
+ var element = document.getElementById('modal-' + String(this._modalID));
+ document.getElementById('modal-no-button-' + String(this._modalID)).onclick = function () {
+ element.classList.remove('is-active');
+ element.parentNode.removeChild(element);
+ };
+ };
+ DlgYesNo.prototype.getModalHTML = function () {
+ var html = ' \
+<div class="modal" id="modal-__created_id__"> \
+ <div class="modal-background" id="modal-background-__created_id__"></div> \
+ <div class="modal-card"> \
+ <header class="modal-card-head" id="modal-head-__created_id__"> \
+ <p class="modal-card-title" id="modal-title-__created_id__">Yes / No Modal Template</p> \
+ <button class="delete" id="modal-cross-button-__created_id__"></button> \
+ </header> \
+ <section class="modal-card-body" id="modal-body-__created_id__">Yes / No Modal Body</section> \
+ <footer class="modal-card-foot is-fullwidth" id="modal-foot-__created_id__"> \
+ <button type="button" class="button is-pulled-left" id="modal-no-button-__created_id__" style="min-width:120px;">Cancel</button> \
+ <button type="button" class="button is-pulled-right" id="modal-yes-button-__created_id__" style="min-width:120px;">OK</button> \
+ </footer> \
+ </div> \
+</div>';
+ html = html.split('__created_id__').join(String(this._modalID));
+ return html;
+ };
+ DlgYesNo.prototype.yesButtonText = function (text) {
+ var button = document.getElementById('modal-yes-button-' + String(this._modalID));
+ button.innerText = text;
+ return this._instance;
+ };
+ DlgYesNo.prototype.noButtonText = function (text) {
+ var button = document.getElementById('modal-no-button-' + String(this._modalID));
+ button.innerText = text;
+ return this._instance;
+ };
+ DlgYesNo.prototype.title = function (text) {
+ var p = document.getElementById('modal-title-' + String(this._modalID));
+ p.innerText = text;
+ return this._instance;
+ };
+ DlgYesNo.prototype.text = function (text) {
+ var d = document.getElementById('modal-body-' + String(this._modalID));
+ d.innerText = text;
+ return this._instance;
+ };
+ DlgYesNo.prototype.type = function (type) {
+ var header = document.getElementById('modal-head-' + String(this._modalID));
+ header.className = 'modal-card-head has-background-' + type;
+ return this._instance;
+ };
+ DlgYesNo.prototype.yesFunction = function (f) {
+ var element = document.getElementById('modal-' + String(this._modalID));
+ document.getElementById('modal-yes-button-' + String(this._modalID)).onclick = function (e) {
+ f(e);
+ element.classList.remove('is-active');
+ element.parentNode.removeChild(element);
+ };
+ return this._instance;
+ };
+ DlgYesNo.prototype.noFunction = function (f) {
+ var element = document.getElementById('modal-' + String(this._modalID));
+ document.getElementById('modal-no-button-' + String(this._modalID)).onclick = function (e) {
+ f(e);
+ element.classList.remove('is-active');
+ element.parentNode.removeChild(element);
+ };
+ return this._instance;
+ };
+ DlgYesNo.prototype.open = function () {
+ document.getElementById('modal-' + String(this._modalID)).classList.add('is-active');
+ };
+ DlgYesNo._instanceCount = 0;
+ return DlgYesNo;
+}());
More information about the Libreoffice-commits
mailing list