[Libreoffice-commits] online.git: 4 commits - loleaflet/debug loleaflet/dist loleaflet/src
Pranav Kant
pranavk at collabora.com
Wed Jun 22 14:40:39 UTC 2016
loleaflet/debug/document/loleaflet.html | 16 +++
loleaflet/dist/loleaflet-help.html | 42 ---------
loleaflet/dist/loleaflet.html | 13 --
loleaflet/dist/toolbar.css | 12 --
loleaflet/dist/toolbar/jquery.simplemodal.1.4.4.min.js | 26 -----
loleaflet/src/control/Toolbar.js | 77 +++++++++++++++--
6 files changed, 92 insertions(+), 94 deletions(-)
New commits:
commit 55ead88236b99deab9dffa40ce4a69bd9696b8ae
Author: Pranav Kant <pranavk at collabora.com>
Date: Wed Jun 22 19:56:54 2016 +0530
loleaflet: Kill simplemodal library
Its use has been superceded by vex now
Change-Id: I4b032dd6e5de61548b76b56e946ced6fc86734d3
diff --git a/loleaflet/debug/document/loleaflet.html b/loleaflet/debug/document/loleaflet.html
index 1d9a8fd..dc3ea10 100644
--- a/loleaflet/debug/document/loleaflet.html
+++ b/loleaflet/debug/document/loleaflet.html
@@ -52,7 +52,6 @@
<script src="/loleaflet/%VERSION%/toolbar/select2.min.js"></script>
<script src="/loleaflet/%VERSION%/jqueryui/1.11.1/jquery-ui.min.js"></script>
<script src="/loleaflet/%VERSION%/toolbar/evol.colorpicker.min.js"></script>
- <script src="/loleaflet/%VERSION%/toolbar/jquery.simplemodal.1.4.4.min.js"></script>
<script src="/loleaflet/%VERSION%/leaflet-src.js"></script>
<script src="/loleaflet/%VERSION%/plugins/draw-0.2.4/dist/leaflet.draw.js"></script>
<script src="/loleaflet/%VERSION%/scrollbar/jquery.mCustomScrollbar.js"></script>
diff --git a/loleaflet/dist/loleaflet.html b/loleaflet/dist/loleaflet.html
index 84408a1..e62f548 100644
--- a/loleaflet/dist/loleaflet.html
+++ b/loleaflet/dist/loleaflet.html
@@ -52,7 +52,6 @@
<script src="/loleaflet/%VERSION%/toolbar/select2.min.js"></script>
<script src="https://ajax.googleapis.com/ajax/libs/jqueryui/1.11.1/jquery-ui.min.js"></script>
<script src="/loleaflet/%VERSION%/toolbar/evol.colorpicker.min.js"></script>
- <script src="/loleaflet/%VERSION%/toolbar/jquery.simplemodal.1.4.4.min.js"></script>
<script src="/loleaflet/%VERSION%/leaflet-src.js"></script>
<script src="/loleaflet/%VERSION%/plugins/draw-0.2.4/dist/leaflet.draw.js"></script>
<script src="/loleaflet/%VERSION%/scrollbar/jquery.mCustomScrollbar.js"></script>
diff --git a/loleaflet/dist/toolbar.css b/loleaflet/dist/toolbar.css
index 35e7976..e0e765a 100644
--- a/loleaflet/dist/toolbar.css
+++ b/loleaflet/dist/toolbar.css
@@ -257,18 +257,6 @@ button.leaflet-control-search-next
.w2ui-icon.prevrecord{ background: url('/loleaflet/dist/images/lc_prevrecord.png') no-repeat center !important; }
.w2ui-icon.lastrecord{ background: url('/loleaflet/dist/images/lc_lastrecord.png') no-repeat center !important; }
-#simplemodal-container a.modalCloseImg {
- background:url('/loleaflet/dist/images/lc_closedoc.png') no-repeat;
- width:25px;
- height:29px;
- display:inline;
- z-index:3200;
- position:absolute;
- top:0px;
- right:-1px;
- cursor:pointer;
-}
-
.inserttable-pop {
z-index: 100000;
box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.3);
diff --git a/loleaflet/dist/toolbar/jquery.simplemodal.1.4.4.min.js b/loleaflet/dist/toolbar/jquery.simplemodal.1.4.4.min.js
deleted file mode 100644
index 382c736..0000000
--- a/loleaflet/dist/toolbar/jquery.simplemodal.1.4.4.min.js
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * SimpleModal 1.4.4 - jQuery Plugin
- * http://simplemodal.com/
- * Copyright (c) 2013 Eric Martin
- * Licensed under MIT and GPL
- * Date: Sun, Jan 20 2013 15:58:56 -0800
- */
-(function(b){"function"===typeof define&&define.amd?define(["jquery"],b):b(jQuery)})(function(b){var j=[],n=b(document),k=navigator.userAgent.toLowerCase(),l=b(window),g=[],o=null,p=/msie/.test(k)&&!/opera/.test(k),q=/opera/.test(k),m,r;m=p&&/msie 6./.test(k)&&"object"!==typeof window.XMLHttpRequest;r=p&&/msie 7.0/.test(k);b.modal=function(a,h){return b.modal.impl.init(a,h)};b.modal.close=function(){b.modal.impl.close()};b.modal.focus=function(a){b.modal.impl.focus(a)};b.modal.setContainerDimensions=
-function(){b.modal.impl.setContainerDimensions()};b.modal.setPosition=function(){b.modal.impl.setPosition()};b.modal.update=function(a,h){b.modal.impl.update(a,h)};b.fn.modal=function(a){return b.modal.impl.init(this,a)};b.modal.defaults={appendTo:"body",focus:!0,opacity:50,overlayId:"simplemodal-overlay",overlayCss:{},containerId:"simplemodal-container",containerCss:{},dataId:"simplemodal-data",dataCss:{},minHeight:null,minWidth:null,maxHeight:null,maxWidth:null,autoResize:!1,autoPosition:!0,zIndex:1E3,
-close:!0,closeHTML:'<a class="modalCloseImg" title="Close"></a>',closeClass:"simplemodal-close",escClose:!0,overlayClose:!1,fixed:!0,position:null,persist:!1,modal:!0,onOpen:null,onShow:null,onClose:null};b.modal.impl={d:{},init:function(a,h){if(this.d.data)return!1;o=p&&!b.support.boxModel;this.o=b.extend({},b.modal.defaults,h);this.zIndex=this.o.zIndex;this.occb=!1;if("object"===typeof a){if(a=a instanceof b?a:b(a),this.d.placeholder=!1,0<a.parent().parent().size()&&(a.before(b("<span></span>").attr("id",
-"simplemodal-placeholder").css({display:"none"})),this.d.placeholder=!0,this.display=a.css("display"),!this.o.persist))this.d.orig=a.clone(!0)}else if("string"===typeof a||"number"===typeof a)a=b("<div></div>").html(a);else return alert("SimpleModal Error: Unsupported data type: "+typeof a),this;this.create(a);this.open();b.isFunction(this.o.onShow)&&this.o.onShow.apply(this,[this.d]);return this},create:function(a){this.getDimensions();if(this.o.modal&&m)this.d.iframe=b('<iframe src="javascript:false;"></iframe>').css(b.extend(this.o.iframeCss,
-{display:"none",opacity:0,position:"fixed",height:g[0],width:g[1],zIndex:this.o.zIndex,top:0,left:0})).appendTo(this.o.appendTo);this.d.overlay=b("<div></div>").attr("id",this.o.overlayId).addClass("simplemodal-overlay").css(b.extend(this.o.overlayCss,{display:"none",opacity:this.o.opacity/100,height:this.o.modal?j[0]:0,width:this.o.modal?j[1]:0,position:"fixed",left:0,top:0,zIndex:this.o.zIndex+1})).appendTo(this.o.appendTo);this.d.container=b("<div></div>").attr("id",this.o.containerId).addClass("simplemodal-container").css(b.extend({position:this.o.fixed?
-"fixed":"absolute"},this.o.containerCss,{display:"none",zIndex:this.o.zIndex+2})).append(this.o.close&&this.o.closeHTML?b(this.o.closeHTML).addClass(this.o.closeClass):"").appendTo(this.o.appendTo);this.d.wrap=b("<div></div>").attr("tabIndex",-1).addClass("simplemodal-wrap").css({height:"100%",outline:0,width:"100%"}).appendTo(this.d.container);this.d.data=a.attr("id",a.attr("id")||this.o.dataId).addClass("simplemodal-data").css(b.extend(this.o.dataCss,{display:"none"})).appendTo("body");this.setContainerDimensions();
-this.d.data.appendTo(this.d.wrap);(m||o)&&this.fixIE()},bindEvents:function(){var a=this;b("."+a.o.closeClass).bind("click.simplemodal",function(b){b.preventDefault();a.close()});a.o.modal&&a.o.close&&a.o.overlayClose&&a.d.overlay.bind("click.simplemodal",function(b){b.preventDefault();a.close()});n.bind("keydown.simplemodal",function(b){a.o.modal&&9===b.keyCode?a.watchTab(b):a.o.close&&a.o.escClose&&27===b.keyCode&&(b.preventDefault(),a.close())});l.bind("resize.simplemodal orientationchange.simplemodal",
-function(){a.getDimensions();a.o.autoResize?a.setContainerDimensions():a.o.autoPosition&&a.setPosition();m||o?a.fixIE():a.o.modal&&(a.d.iframe&&a.d.iframe.css({height:g[0],width:g[1]}),a.d.overlay.css({height:j[0],width:j[1]}))})},unbindEvents:function(){b("."+this.o.closeClass).unbind("click.simplemodal");n.unbind("keydown.simplemodal");l.unbind(".simplemodal");this.d.overlay.unbind("click.simplemodal")},fixIE:function(){var a=this.o.position;b.each([this.d.iframe||null,!this.o.modal?null:this.d.overlay,
-"fixed"===this.d.container.css("position")?this.d.container:null],function(b,e){if(e){var f=e[0].style;f.position="absolute";if(2>b)f.removeExpression("height"),f.removeExpression("width"),f.setExpression("height",'document.body.scrollHeight > document.body.clientHeight ? document.body.scrollHeight : document.body.clientHeight + "px"'),f.setExpression("width",'document.body.scrollWidth > document.body.clientWidth ? document.body.scrollWidth : document.body.clientWidth + "px"');else{var c,d;a&&a.constructor===
-Array?(c=a[0]?"number"===typeof a[0]?a[0].toString():a[0].replace(/px/,""):e.css("top").replace(/px/,""),c=-1===c.indexOf("%")?c+' + (t = document.documentElement.scrollTop ? document.documentElement.scrollTop : document.body.scrollTop) + "px"':parseInt(c.replace(/%/,""))+' * ((document.documentElement.clientHeight || document.body.clientHeight) / 100) + (t = document.documentElement.scrollTop ? document.documentElement.scrollTop : document.body.scrollTop) + "px"',a[1]&&(d="number"===typeof a[1]?
-a[1].toString():a[1].replace(/px/,""),d=-1===d.indexOf("%")?d+' + (t = document.documentElement.scrollLeft ? document.documentElement.scrollLeft : document.body.scrollLeft) + "px"':parseInt(d.replace(/%/,""))+' * ((document.documentElement.clientWidth || document.body.clientWidth) / 100) + (t = document.documentElement.scrollLeft ? document.documentElement.scrollLeft : document.body.scrollLeft) + "px"')):(c='(document.documentElement.clientHeight || document.body.clientHeight) / 2 - (this.offsetHeight / 2) + (t = document.documentElement.scrollTop ? document.documentElement.scrollTop : document.body.scrollTop) + "px"',
-d='(document.documentElement.clientWidth || document.body.clientWidth) / 2 - (this.offsetWidth / 2) + (t = document.documentElement.scrollLeft ? document.documentElement.scrollLeft : document.body.scrollLeft) + "px"');f.removeExpression("top");f.removeExpression("left");f.setExpression("top",c);f.setExpression("left",d)}}})},focus:function(a){var h=this,a=a&&-1!==b.inArray(a,["first","last"])?a:"first",e=b(":input:enabled:visible:"+a,h.d.wrap);setTimeout(function(){0<e.length?e.focus():h.d.wrap.focus()},
-10)},getDimensions:function(){var a="undefined"===typeof window.innerHeight?l.height():window.innerHeight;j=[n.height(),n.width()];g=[a,l.width()]},getVal:function(a,b){return a?"number"===typeof a?a:"auto"===a?0:0<a.indexOf("%")?parseInt(a.replace(/%/,""))/100*("h"===b?g[0]:g[1]):parseInt(a.replace(/px/,"")):null},update:function(a,b){if(!this.d.data)return!1;this.d.origHeight=this.getVal(a,"h");this.d.origWidth=this.getVal(b,"w");this.d.data.hide();a&&this.d.container.css("height",a);b&&this.d.container.css("width",
-b);this.setContainerDimensions();this.d.data.show();this.o.focus&&this.focus();this.unbindEvents();this.bindEvents()},setContainerDimensions:function(){var a=m||r,b=this.d.origHeight?this.d.origHeight:q?this.d.container.height():this.getVal(a?this.d.container[0].currentStyle.height:this.d.container.css("height"),"h"),a=this.d.origWidth?this.d.origWidth:q?this.d.container.width():this.getVal(a?this.d.container[0].currentStyle.width:this.d.container.css("width"),"w"),e=this.d.data.outerHeight(!0),f=
-this.d.data.outerWidth(!0);this.d.origHeight=this.d.origHeight||b;this.d.origWidth=this.d.origWidth||a;var c=this.o.maxHeight?this.getVal(this.o.maxHeight,"h"):null,d=this.o.maxWidth?this.getVal(this.o.maxWidth,"w"):null,c=c&&c<g[0]?c:g[0],d=d&&d<g[1]?d:g[1],i=this.o.minHeight?this.getVal(this.o.minHeight,"h"):"auto",b=b?this.o.autoResize&&b>c?c:b<i?i:b:e?e>c?c:this.o.minHeight&&"auto"!==i&&e<i?i:e:i,c=this.o.minWidth?this.getVal(this.o.minWidth,"w"):"auto",a=a?this.o.autoResize&&a>d?d:a<c?c:a:f?
-f>d?d:this.o.minWidth&&"auto"!==c&&f<c?c:f:c;this.d.container.css({height:b,width:a});this.d.wrap.css({overflow:e>b||f>a?"auto":"visible"});this.o.autoPosition&&this.setPosition()},setPosition:function(){var a,b;a=g[0]/2-this.d.container.outerHeight(!0)/2;b=g[1]/2-this.d.container.outerWidth(!0)/2;var e="fixed"!==this.d.container.css("position")?l.scrollTop():0;this.o.position&&"[object Array]"===Object.prototype.toString.call(this.o.position)?(a=e+(this.o.position[0]||a),b=this.o.position[1]||b):
-a=e+a;this.d.container.css({left:b,top:a})},watchTab:function(a){if(0<b(a.target).parents(".simplemodal-container").length){if(this.inputs=b(":input:enabled:visible:first, :input:enabled:visible:last",this.d.data[0]),!a.shiftKey&&a.target===this.inputs[this.inputs.length-1]||a.shiftKey&&a.target===this.inputs[0]||0===this.inputs.length)a.preventDefault(),this.focus(a.shiftKey?"last":"first")}else a.preventDefault(),this.focus()},open:function(){this.d.iframe&&this.d.iframe.show();b.isFunction(this.o.onOpen)?
-this.o.onOpen.apply(this,[this.d]):(this.d.overlay.show(),this.d.container.show(),this.d.data.show());this.o.focus&&this.focus();this.bindEvents()},close:function(){if(!this.d.data)return!1;this.unbindEvents();if(b.isFunction(this.o.onClose)&&!this.occb)this.occb=!0,this.o.onClose.apply(this,[this.d]);else{if(this.d.placeholder){var a=b("#simplemodal-placeholder");this.o.persist?a.replaceWith(this.d.data.removeClass("simplemodal-data").css("display",this.display)):(this.d.data.hide().remove(),a.replaceWith(this.d.orig))}else this.d.data.hide().remove();
-this.d.container.hide().remove();this.d.overlay.hide();this.d.iframe&&this.d.iframe.hide().remove();this.d.overlay.remove();this.d={}}}}});
commit a789cff8e8d782ecdb2e1d50021a359e4cbd23e8
Author: Pranav Kant <pranavk at collabora.com>
Date: Wed Jun 22 19:37:44 2016 +0530
loleaflet: Migrate about dialog to vex
Change-Id: Id853ec14d817b2f4312dee70a087a4ac526e951b
diff --git a/loleaflet/debug/document/loleaflet.html b/loleaflet/debug/document/loleaflet.html
index 0bab0fc..1d9a8fd 100644
--- a/loleaflet/debug/document/loleaflet.html
+++ b/loleaflet/debug/document/loleaflet.html
@@ -137,5 +137,19 @@
</script>
+ <div id="about-dialog" style="display:none; text-align: center;">
+ <h1 id="product-name">LibreOffice Online</h1>
+ <hr/>
+ <h3 id="product-string"></h3>
+ <p>
+ <h3>LOOLWSD</h3>
+ <div id="loolwsd-version"></div>
+ </p>
+ <p>
+ <h3>LOKit</h3>
+ <div id="lokit-version"></div>
+ </p>
+ </div>
+
<script src="/loleaflet/%VERSION%/toolbar/toolbar.js"></script>
</body></html>
diff --git a/loleaflet/dist/loleaflet.html b/loleaflet/dist/loleaflet.html
index 35af095..84408a1 100644
--- a/loleaflet/dist/loleaflet.html
+++ b/loleaflet/dist/loleaflet.html
@@ -138,9 +138,9 @@
</script>
<div id="about-dialog" style="display:none; text-align: center;">
- <h1 class="translatable">About LibreOffice Online</h1>
+ <h1 id="product-name">LibreOffice Online</h1>
<hr/>
- <h3 class="translatable">This version of LibreOffice Online is powered by</h3>
+ <h3 id="product-string"></h3>
<p>
<h3>LOOLWSD</h3>
<div id="loolwsd-version"></div>
@@ -151,12 +151,5 @@
</p>
</div>
- <script>
- var translatableContent = document.getElementsByClassName("translatable");
- for (var i=0; i < translatableContent.length; i++) {
- translatableContent[i].innerHTML = translatableContent[i].innerHTML.toLocaleString();
- }
- </script>
-
<script src="/loleaflet/%VERSION%/toolbar/toolbar.js"></script>
</body></html>
diff --git a/loleaflet/src/control/Toolbar.js b/loleaflet/src/control/Toolbar.js
index feab16e..93fac44 100644
--- a/loleaflet/src/control/Toolbar.js
+++ b/loleaflet/src/control/Toolbar.js
@@ -2,7 +2,7 @@
* Toolbar handler
*/
-/* global $ window vex */
+/* global $ window vex brandProductName */
L.Map.include({
// a mapping of uno commands to more readable toolbar items
@@ -204,6 +204,30 @@ L.Map.include({
},
showLOAboutDialog: function() {
- $('#about-dialog').modal(this._modalDialogOptions);
+ // Move the div sitting in 'body' as vex-content and make it visible
+ var content = $('#about-dialog').clone().css({display: 'block'});
+ // fill product-name and product-string
+ var productName = brandProductName || 'LibreOffice Online';
+ content.find('#product-name').text(productName);
+ content.find('#product-string').text(_('This version of ' + productName + ' is powered by'));
+ var w = window.innerWidth / 2;
+ vex.open({
+ content: content,
+ showCloseButton: true,
+ escapeButtonCloses: true,
+ overlayClosesOnClick: true,
+ contentCSS: { width: w + 'px'},
+ buttons: {},
+ afterOpen: function($vexContent) {
+ // workaround for https://github.com/HubSpot/vex/issues/43
+ $('.vex-overlay').css({ 'pointer-events': 'none'});
+ $('.vex').click(function() {
+ vex.close($vexContent.data().vex.id);
+ });
+ $('.vex-content').click(function(e) {
+ e.stopPropagation();
+ });
+ }
+ });
}
});
commit 1a46db62bd1dbc80b2e9e998aa8e35cb2ac45c2c
Author: Pranav Kant <pranavk at collabora.com>
Date: Wed Jun 22 19:34:57 2016 +0530
loleaflet: Workaround for an upstream bug in vex
https://github.com/HubSpot/vex/issues/43
Change-Id: Id26be54a3a1120119bddad442e30b5f71f1e2605
diff --git a/loleaflet/src/control/Toolbar.js b/loleaflet/src/control/Toolbar.js
index 8ef3f52..feab16e 100644
--- a/loleaflet/src/control/Toolbar.js
+++ b/loleaflet/src/control/Toolbar.js
@@ -189,6 +189,15 @@ L.Map.include({
for (i = 0, max = translatableContent.length; i < max; i++) {
translatableContent[i].firstChild.nodeValue = translatableContent[i].firstChild.nodeValue.toLocaleString();
}
+
+ // workaround for https://github.com/HubSpot/vex/issues/43
+ $('.vex-overlay').css({ 'pointer-events': 'none'});
+ $('.vex').click(function() {
+ vex.close($vexContent.data().vex.id);
+ });
+ $('.vex-content').click(function(e) {
+ e.stopPropagation();
+ });
}
});
});
commit c632cf5716db346103afa9d7bf9d407202bd9c86
Author: Pranav Kant <pranavk at collabora.com>
Date: Wed Jun 22 18:22:25 2016 +0530
loleaflet: Migrate keyboard-shortcuts dialog to vex
Change-Id: I82324405ee1205becea00fc1de97c248988ab378
diff --git a/loleaflet/debug/document/loleaflet.html b/loleaflet/debug/document/loleaflet.html
index f0ecc5e..0bab0fc 100644
--- a/loleaflet/debug/document/loleaflet.html
+++ b/loleaflet/debug/document/loleaflet.html
@@ -29,6 +29,7 @@
<link rel="localizations" href="/loleaflet/%VERSION%/l10n/localizations.json" type="application/vnd.oftn.l10n+json"/>
<link rel="localizations" href="/loleaflet/%VERSION%/l10n/styles-localizations.json" type="application/vnd.oftn.l10n+json" />
<link rel="localizations" href="/loleaflet/%VERSION%/l10n/uno-localizations.json" type="application/vnd.oftn.l10n+json" />
+<link rel="localizations" href="/loleaflet/%VERSION%/dist/l10n/help-localizations.json" type="application/vnd.oftn.l10n+json"/>
<style type="text/css"></style></head>
<body>
<script src="/loleaflet/%VERSION%/jquery/2.1.0/jquery.min.js"></script>
diff --git a/loleaflet/dist/loleaflet-help.html b/loleaflet/dist/loleaflet-help.html
index ddb854b..2184635 100644
--- a/loleaflet/dist/loleaflet-help.html
+++ b/loleaflet/dist/loleaflet-help.html
@@ -1,12 +1,3 @@
-<!DOCTYPE html>
-<html>
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <title>LOLeaflet Help</title>
- <meta charset="utf-8">
- <link rel="localizations" href="/loleaflet/dist/l10n/help-localizations.json" type="application/vnd.oftn.l10n+json"/>
-</head>
-<body onload="selectHelp()">
<style>
h1 {
text-align: center;
@@ -30,21 +21,7 @@
width: 30%;
}
</style>
- <script src="/loleaflet/dist/l10n/json2.min.js"></script>
- <script src="/loleaflet/dist/l10n/l10n.min.js"></script>
- <script>
- function selectHelp() {
- if (parent.map.getDocType() === 'text') {
- document.getElementById('text-shortcuts').style.display='block';
- }
- else if (parent.map.getDocType() === 'spreadsheet') {
- document.getElementById('spreadsheet-shortcuts').style.display='block';
- }
- else if (parent.map.getDocType() === 'presentation' || parent.map.getDocType() === 'drawing') {
- document.getElementById('presentation-shortcuts').style.display='block';
- }
- }
- </script>
+<div>
<h1>Keyboard Shortcuts</h1>
<div id="general-shortcuts">
<h2>General Keyboard Shortcuts</h2>
@@ -235,19 +212,4 @@
<tr> <td class="function">Select all in slide / drawing page</td> <td class="shortcut">Ctrl + A</td> </tr>
</table>
</div>
- <script>
- var translatableContent = document.getElementsByTagName("h1");
- for (var i=0, max=translatableContent.length; i < max; i++) {
- translatableContent[i].firstChild.nodeValue = translatableContent[i].firstChild.nodeValue.toLocaleString();
- }
- translatableContent = document.getElementsByTagName("h2");
- for (var i=0, max=translatableContent.length; i < max; i++) {
- translatableContent[i].firstChild.nodeValue = translatableContent[i].firstChild.nodeValue.toLocaleString();
- }
- translatableContent = document.getElementsByTagName("td");
- for (var i=0, max=translatableContent.length; i < max; i++) {
- translatableContent[i].firstChild.nodeValue = translatableContent[i].firstChild.nodeValue.toLocaleString();
- }
- </script>
-</body>
-</html>
+</div>
diff --git a/loleaflet/dist/loleaflet.html b/loleaflet/dist/loleaflet.html
index 501dbc3..35af095 100644
--- a/loleaflet/dist/loleaflet.html
+++ b/loleaflet/dist/loleaflet.html
@@ -29,6 +29,7 @@
<link rel="localizations" href="/loleaflet/%VERSION%/l10n/localizations.json" type="application/vnd.oftn.l10n+json"/>
<link rel="localizations" href="/loleaflet/%VERSION%/l10n/styles-localizations.json" type="application/vnd.oftn.l10n+json" />
<link rel="localizations" href="/loleaflet/%VERSION%/l10n/uno-localizations.json" type="application/vnd.oftn.l10n+json" />
+<link rel="localizations" href="/loleaflet/%VERSION%/dist/l10n/help-localizations.json" type="application/vnd.oftn.l10n+json"/>
<style type="text/css"></style></head>
<body>
<script src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.0/jquery.min.js"></script>
diff --git a/loleaflet/src/control/Toolbar.js b/loleaflet/src/control/Toolbar.js
index 3f6f220..8ef3f52 100644
--- a/loleaflet/src/control/Toolbar.js
+++ b/loleaflet/src/control/Toolbar.js
@@ -2,7 +2,7 @@
* Toolbar handler
*/
-/* global $ window */
+/* global $ window vex */
L.Map.include({
// a mapping of uno commands to more readable toolbar items
@@ -155,9 +155,43 @@ L.Map.include({
showLOKeyboardHelp: function() {
var w = window.innerWidth / 2;
- var h = window.innerHeight / 2;
- $.modal('<iframe src="/loleaflet/dist/loleaflet-help.html" width="' + w + '" height="' + h + '" style="border:0">',
- this._modalDialogOptions);
+ $.get('/loleaflet/dist/loleaflet-help.html', function(data) {
+ vex.open({
+ content: data,
+ showCloseButton: true,
+ escapeButtonCloses: true,
+ overlayClosesOnClick: true,
+ contentCSS: {width: w + 'px'},
+ buttons: {},
+ afterOpen: function($vexContent) {
+ // Display help according to document opened
+ if (map.getDocType() === 'text') {
+ document.getElementById('text-shortcuts').style.display='block';
+ }
+ else if (map.getDocType() === 'spreadsheet') {
+ document.getElementById('spreadsheet-shortcuts').style.display='block';
+ }
+ else if (map.getDocType() === 'presentation' || map.getDocType() === 'drawing') {
+ document.getElementById('presentation-shortcuts').style.display='block';
+ }
+
+ // Lets transalte
+ var i, max;
+ var translatableContent = $vexContent.find('h1');
+ for (i = 0, max = translatableContent.length; i < max; i++) {
+ translatableContent[i].firstChild.nodeValue = translatableContent[i].firstChild.nodeValue.toLocaleString();
+ }
+ translatableContent = $vexContent.find('h2');
+ for (i = 0, max = translatableContent.length; i < max; i++) {
+ translatableContent[i].firstChild.nodeValue = translatableContent[i].firstChild.nodeValue.toLocaleString();
+ }
+ translatableContent = $vexContent.find('td');
+ for (i = 0, max = translatableContent.length; i < max; i++) {
+ translatableContent[i].firstChild.nodeValue = translatableContent[i].firstChild.nodeValue.toLocaleString();
+ }
+ }
+ });
+ });
},
showLOAboutDialog: function() {
More information about the Libreoffice-commits
mailing list