subject:"\[Libreoffice\-commits\] online.git\: loleaflet\/debug"

[Libreoffice-commits] online.git: loleaflet/debug

2019-10-29 Thread Henry Castro (via logerrit)

 loleaflet/debug/css/mobile.css|6 
 loleaflet/debug/css/screen.css|5 
 loleaflet/debug/document/loleaflet.html   |  161 --
 loleaflet/debug/hacks/jitter.html |   40 ---
 loleaflet/debug/leaflet-include.js|   60 -
 loleaflet/debug/map/canvas.html   |   49 
 loleaflet/debug/map/controls.html |   46 
 loleaflet/debug/map/geolocation.html  |   34 ---
 loleaflet/debug/map/grid.html |   48 
 loleaflet/debug/map/iframe.html   |   11 -
 loleaflet/debug/map/image-overlay.html|   48 
 loleaflet/debug/map/layer_remove_add.html |   45 
 loleaflet/debug/map/map-mobile.html   |   34 ---
 loleaflet/debug/map/map.html  |   57 -
 loleaflet/debug/map/markers.html  |   68 --
 loleaflet/debug/map/max-bounds.html   |   38 ---
 loleaflet/debug/map/opacity.html  |  197 --
 loleaflet/debug/map/scroll.html   |   41 ---
 loleaflet/debug/map/simple-proj.html  |   59 -
 loleaflet/debug/map/wms-marble.html   |   30 --
 loleaflet/debug/map/wms.html  |   40 ---
 loleaflet/debug/map/zoom-remain-centered.html |   44 
 loleaflet/debug/map/zoomlevels.html   |   41 ---
 loleaflet/debug/map/zoompan.html  |   71 --
 loleaflet/debug/tests/add_remove_layers.html  |   87 ---
 loleaflet/debug/tests/bringtoback.html|   37 ---
 loleaflet/debug/tests/canvasloop.html |   47 
 loleaflet/debug/tests/click_on_canvas.html|   58 -
 loleaflet/debug/tests/click_on_canvas_broken.html |   49 
 loleaflet/debug/tests/dragging_and_copyworldjump.html |   61 -
 loleaflet/debug/tests/opacity.html|   56 -
 loleaflet/debug/tests/popupcontextmenuclicks.html |   58 -
 loleaflet/debug/tests/remove_while_dragging.html  |   28 --
 loleaflet/debug/tests/removetilewhilepan.html |   41 ---
 loleaflet/debug/tests/reuse_popups.html   |   37 ---
 loleaflet/debug/tests/rtl.html|   40 ---
 loleaflet/debug/tests/rtl2.html   |   27 --
 loleaflet/debug/tests/set_icon_reuse_dom.html |   43 ---
 loleaflet/debug/tests/svg_clicks.html |   54 
 loleaflet/debug/vector/bounds-extend.html |   88 
 loleaflet/debug/vector/feature-group-bounds.html  |   90 
 loleaflet/debug/vector/geojson-sample.js  |   54 
 loleaflet/debug/vector/geojson.html   |  171 ---
 loleaflet/debug/vector/rectangle.html |   53 
 loleaflet/debug/vector/route.js   |2 
 loleaflet/debug/vector/touchzoomemu.html  |  194 -
 loleaflet/debug/vector/us-states.js   |   55 -
 loleaflet/debug/vector/vector-bounds.html |   70 --
 loleaflet/debug/vector/vector-canvas.html |   93 
 loleaflet/debug/vector/vector-mobile.html |   39 ---
 loleaflet/debug/vector/vector-simple.html |   44 
 loleaflet/debug/vector/vector.html|   38 ---
 loleaflet/debug/vector/vector2.html   |   59 -
 53 files changed, 3046 deletions(-)

New commits:
commit 6942ee012ee42aa1f91f85f440cbf759a13ea75d
Author: Henry Castro 
AuthorDate: Fri Oct 25 10:49:42 2019 -0400
Commit: Henry Castro 
CommitDate: Tue Oct 29 16:17:12 2019 +0100

loleaflet: remove unused loleaflet/debug folder

Long time ago, the leaflet project was imported to be
reused for document tile rending instead of map tiles.
During that time they were added so many commit and the
leaflet source code suffer modifications and mutations like:
new functions are removed dead code (related to map Geo locations).
Now if you try to open some of the files, it will not work,
and to not confuse new contributors, it is preferable to remove all this
unused files.

But if you still interested in how to use all these files,
please go to the original repository
https://github.com/Leaflet/Leaflet.git
and checkout the branch version 0.8.0-dev, you will be happy how all
this file works very well.

However, if you want to debug the new changes, I strongly recommend you
to add

./configure --enable-debug  /* other parameters */

to debug Collabora Online.

Any objections?

Change-Id: I38c85f5716f608390e79edbffecacb3561fda97a
Reviewed-on: https://gerrit.libreoffice.org/81508
Reviewed-by: Henry Castro 
Tested-by: Henry

[Libreoffice-commits] online.git: loleaflet/debug loleaflet/src

2019-10-15 Thread Szymon Kłos (via logerrit)

 loleaflet/debug/document/loleaflet.html  |2 +-
 loleaflet/src/control/Control.Menubar.js |4 ++--
 loleaflet/src/control/Control.Toolbar.js |   31 ---
 loleaflet/src/main.js|3 +--
 loleaflet/src/map/Map.js |6 +++---
 5 files changed, 23 insertions(+), 23 deletions(-)

New commits:
commit 05a6486f3635fd6926cd0d32cd2b31031117c382
Author: Szymon Kłos 
AuthorDate: Tue Oct 15 12:08:14 2019 +0200
Commit: Szymon Kłos 
CommitDate: Tue Oct 15 12:08:14 2019 +0200

Fix initial state of closebutton (show in integration)

Change-Id: I7b1fa565098f32817674fbeff5676cafa6957f31

diff --git a/loleaflet/debug/document/loleaflet.html 
b/loleaflet/debug/document/loleaflet.html
index 89156fe20..f7d17966c 100644
--- a/loleaflet/debug/document/loleaflet.html
+++ b/loleaflet/debug/document/loleaflet.html
@@ -106,7 +106,7 @@
 var filePath = getParameterByName('file_path');
 var permission = getParameterByName('permission') || 'edit';
 var timestamp = getParameterByName('timestamp');
-var closebutton = getParameterByName('closebutton');
+window.closeButtonEnabled = getParameterByName('closebutton');
 if (wopiSrc === '' && filePath === '') {
 vex.dialog.alert(wrongwopisrc);
 }
diff --git a/loleaflet/src/control/Control.Menubar.js 
b/loleaflet/src/control/Control.Menubar.js
index bdb66f948..f36a489f5 100644
--- a/loleaflet/src/control/Control.Menubar.js
+++ b/loleaflet/src/control/Control.Menubar.js
@@ -3,7 +3,7 @@
 * Control.Menubar
 */
 
-/* global $ _ _UNO vex revHistoryEnabled closebutton L */
+/* global $ _ _UNO vex revHistoryEnabled L */
 L.Control.Menubar = L.Control.extend({
// TODO: Some mechanism to stop the need to copy duplicate menus (eg. 
Help)
options: {
@@ -1029,7 +1029,7 @@ L.Control.Menubar = L.Control.extend({
 
if (menuItem.type === 'action') {
if ((menuItem.id === 'rev-history' && 
!revHistoryEnabled) ||
-   (menuItem.id === 'closedocument' && 
!closebutton)) {
+   (menuItem.id === 'closedocument' && 
!window.closebutton)) {
return false;
}
}
diff --git a/loleaflet/src/control/Control.Toolbar.js 
b/loleaflet/src/control/Control.Toolbar.js
index 19bdacc8a..d1a455151 100644
--- a/loleaflet/src/control/Control.Toolbar.js
+++ b/loleaflet/src/control/Control.Toolbar.js
@@ -3,7 +3,7 @@
  * LibreOffice Online toolbar
  */
 
-/* global $ closebutton w2ui w2utils vex _ _UNO */
+/* global $ w2ui w2utils vex _ _UNO */
 /*eslint indent: [error, "tab", { "outerIIFEBody": 0 }]*/
 (function(global) {
 
@@ -2374,20 +2374,6 @@ $(window).resize(function() {
 });
 
 $(document).ready(function() {
-   if (!closebutton) {
-   $('#closebuttonwrapper').hide();
-   } else if (closebutton && !L.Browser.mobile) {
-   $('.closebuttonimage').show();
-   }
-
-   $('#closebutton').click(function() {
-   map.fire('postMessage', {msgId: 'close', args: {EverModified: 
map._everModified, Deprecated: true}});
-   map.fire('postMessage', {msgId: 'UI_Close', args: 
{EverModified: map._everModified}});
-   if (!map._disableDefaultAction['UI_Close']) {
-   map.remove();
-   }
-   });
-
// Attach insert file action
$('#insertgraphic').on('change', onInsertFile);
 });
@@ -2493,6 +2479,21 @@ function setupToolbar(e) {
map.on('updateparts pagenumberchanged', onUpdateParts);
map.on('commandstatechanged', onCommandStateChanged);
map.on('commandvalues', onCommandValues, this);
+
+   if (!window.closeButtonEnabled) {
+   $('#closebuttonwrapper').hide();
+   } else if (window.closeButtonEnabled && !L.Browser.mobile) {
+   $('#closebuttonwrapper').show();
+   $('.closebuttonimage').show();
+   }
+
+   $('#closebutton').click(function() {
+   map.fire('postMessage', {msgId: 'close', args: {EverModified: 
map._everModified, Deprecated: true}});
+   map.fire('postMessage', {msgId: 'UI_Close', args: 
{EverModified: map._everModified}});
+   if (!map._disableDefaultAction['UI_Close']) {
+   map.remove();
+   }
+   });
 }
 
 global.setupToolbar = setupToolbar;
diff --git a/loleaflet/src/main.js b/loleaflet/src/main.js
index 965aa132e..1110b5365 100644
--- a/loleaflet/src/main.js
+++ b/loleaflet/src/main.js
@@ -18,7 +18,7 @@ var filePath = getParameterByName('file_path');
 var permission = getParameterByName('permission') || 'edit';
 var timestamp = getParameterByName('timestamp');
 // Shows close button if non-zero value provided
-var closebutton = getParameterByName('closebutton');
+window.closeButtonEnabled = getParameterByName('closebutton');
 // Shows revision history file menu

[Libreoffice-commits] online.git: loleaflet/debug loleaflet/html loleaflet/l10n

2019-01-18 Thread Libreoffice Gerrit user

 loleaflet/debug/document/loleaflet.html|1 +
 loleaflet/html/loleaflet.html.m4   |6 --
 loleaflet/l10n/uno-localizations-override.json |5 +
 loleaflet/l10n/uno/de-override.json|3 +++
 loleaflet/l10n/uno/es-override.json|4 
 5 files changed, 17 insertions(+), 2 deletions(-)

New commits:
commit 68228fe506536dbbf50f3b8cf3eef5866459ba37
Author: Andras Timar 
AuthorDate: Fri Jan 18 16:39:36 2019 +0100
Commit: Andras Timar 
CommitDate: Fri Jan 18 16:41:54 2019 +0100

loleaflet: add framework to override localizations coming from core + es 
and de fixes

Change-Id: I97ad332c543f120e01563d19607c404b41aaa364
Reviewed-on: https://gerrit.libreoffice.org/66624
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/loleaflet/debug/document/loleaflet.html 
b/loleaflet/debug/document/loleaflet.html
index 63ac680c6..868e4f504 100644
--- a/loleaflet/debug/document/loleaflet.html
+++ b/loleaflet/debug/document/loleaflet.html
@@ -26,6 +26,7 @@
 
 
 
+
 
 
 
diff --git a/loleaflet/html/loleaflet.html.m4 b/loleaflet/html/loleaflet.html.m4
index 9814f4906..358437802 100644
--- a/loleaflet/html/loleaflet.html.m4
+++ b/loleaflet/html/loleaflet.html.m4
@@ -56,11 +56,13 @@ ifelse(MOBILEAPP,[true],
 )dnl
  
 ifelse(MOBILEAPP,[true],
-  [
+  [
+   


],
-  [
+  [
+   


]
diff --git a/loleaflet/l10n/uno-localizations-override.json 
b/loleaflet/l10n/uno-localizations-override.json
new file mode 100644
index 0..5eb810132
--- /dev/null
+++ b/loleaflet/l10n/uno-localizations-override.json
@@ -0,0 +1,5 @@
+{
+"en": false,
+"de": "l10n/uno/de-override.json",
+"es": "l10n/uno/es-override.json"
+}
diff --git a/loleaflet/l10n/uno/de-override.json 
b/loleaflet/l10n/uno/de-override.json
new file mode 100644
index 0..45969bffe
--- /dev/null
+++ b/loleaflet/l10n/uno/de-override.json
@@ -0,0 +1,3 @@
+{
+"Zoom In":"Vergrößern"
+}
diff --git a/loleaflet/l10n/uno/es-override.json 
b/loleaflet/l10n/uno/es-override.json
new file mode 100644
index 0..0704dda94
--- /dev/null
+++ b/loleaflet/l10n/uno/es-override.json
@@ -0,0 +1,4 @@
+{
+"Clone":"Copiar formato",
+"Italic":"Italica"
+}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loleaflet/debug loleaflet/evol.colorpicker.strings.js loleaflet/Makefile.am loleaflet/npm-shrinkwrap.json.in loleaflet/package.json

2018-05-25 Thread Andras Timar

 loleaflet/Makefile.am   |5 +
 loleaflet/debug/document/loleaflet.html |2 --
 loleaflet/evol.colorpicker.strings.js   |7 ---
 loleaflet/npm-shrinkwrap.json.in|   10 --
 loleaflet/package.json  |1 -
 5 files changed, 1 insertion(+), 24 deletions(-)

New commits:
commit b1948bff68c8bbad55cc94b801df107692e92038
Author: Andras Timar 
Date:   Fri May 25 14:56:23 2018 +0200

remove unused evol-colorpicker

Change-Id: I3eaf2040aa8cfaefb7861c33bceac7c1e5d7866a
Reviewed-on: https://gerrit.libreoffice.org/54806
Reviewed-by: Henry Castro 
Tested-by: Henry Castro 

diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am
index bd5fc2a0a..78bccc835 100644
--- a/loleaflet/Makefile.am
+++ b/loleaflet/Makefile.am
@@ -68,8 +68,7 @@ LOLEAFLET_CSS =\
$(builddir)/node_modules/smartmenus/dist/css/sm-core-css.css \
$(builddir)/node_modules/smartmenus/dist/css/sm-simple/sm-simple.css \
$(srcdir)/css/menubar.css \
-   $(builddir)/node_modules/jquery-ui/themes/ui-lightness/jquery-ui.css \
-   $(builddir)/node_modules/evol-colorpicker/css/evol-colorpicker.css
+   $(builddir)/node_modules/jquery-ui/themes/ui-lightness/jquery-ui.css
 
 LOLEAFLET_CSS_DST = $(foreach file,$(LOLEAFLET_CSS),$(builddir)/dist/$(notdir 
$(file)))
 LOLEAFLET_CSS_M4 = $(strip $(foreach file,$(LOLEAFLET_CSS),$(notdir $(file
@@ -81,7 +80,6 @@ NODE_MODULES_JS =\
node_modules/jquery-mousewheel/jquery.mousewheel.js \
node_modules/jquery-contextmenu/dist/jquery.contextMenu.js \
node_modules/jquery-ui/jquery-ui.js \
-   node_modules/evol-colorpicker/js/evol-colorpicker.js \
node_modules/smartmenus/dist/jquery.smartmenus.js \
node_modules/timeago/jquery.timeago.js \
node_modules/autolinker/dist/Autolinker.js \
@@ -251,7 +249,6 @@ install-data-hook:
 pot:
xgettext --from-code=UTF-8 --keyword=_ 
--output=po/templates/loleaflet-ui.pot \
admin.strings.js \
-   evol.colorpicker.strings.js \
src/errormessages.js \
js/toolbar.js \
src/admin/AdminSocketAnalytics.js \
diff --git a/loleaflet/debug/document/loleaflet.html 
b/loleaflet/debug/document/loleaflet.html
index 429da430e..8f9d5fd9d 100644
--- a/loleaflet/debug/document/loleaflet.html
+++ b/loleaflet/debug/document/loleaflet.html
@@ -26,7 +26,6 @@
 
 
 
-
 
 
 
@@ -52,7 +51,6 @@
 
 
 
-
 
 
 
diff --git a/loleaflet/evol.colorpicker.strings.js 
b/loleaflet/evol.colorpicker.strings.js
deleted file mode 100644
index 243259799..0
--- a/loleaflet/evol.colorpicker.strings.js
+++ /dev/null
@@ -1,7 +0,0 @@
-/* Strings for l10n from evol.colorpicker */
-var themeColors = _('Theme Colors');
-var standardColors = _('Standard Colors');
-var webColors = _('Web Colors');
-var backToPalette = _('Back to Palette');
-var history = _('History');
-var noHistory = _('No history yet.');
diff --git a/loleaflet/npm-shrinkwrap.json.in b/loleaflet/npm-shrinkwrap.json.in
index c7c348cda..0cdbb868c 100644
--- a/loleaflet/npm-shrinkwrap.json.in
+++ b/loleaflet/npm-shrinkwrap.json.in
@@ -1169,16 +1169,6 @@
   "integrity": "sha1-nr23Y1rQmccNzEwqH1AEKI6L2SQ=",
   "dev": true
 },
-"evol-colorpicker": {
-  "version": "3.2.6",
-  "resolved": "file:node_shrinkwrap/evol-colorpicker-3.2.6.tgz",
-  "integrity": "sha1-a4Nyx+jvjMVHiCNbl+n6JdZ1Kts=",
-  "dev": true,
-  "requires": {
-"jquery": "2.2.4",
-"jquery-ui": "1.10.5"
-  }
-},
 "evp_bytestokey": {
   "version": "1.0.3",
   "resolved": "file:node_shrinkwrap/evp_bytestokey-1.0.3.tgz",
diff --git a/loleaflet/package.json b/loleaflet/package.json
index 025978dd3..4fbb38854 100644
--- a/loleaflet/package.json
+++ b/loleaflet/package.json
@@ -9,7 +9,6 @@
 "browserify-css": "0.9.1",
 "d3": "3.5.17",
 "eslint": "3.0.0",
-"evol-colorpicker": "3.2.6",
 "exorcist": "0.4.0",
 "jake": "~8.0.10",
 "jquery": "2.2.4",
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loleaflet/debug loleaflet/loleaflet.html.m4

2018-05-23 Thread Andras Timar

 loleaflet/debug/document/loleaflet.html |2 +-
 loleaflet/loleaflet.html.m4 |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 8490cecdf5b39adc6eb2fff34daade72f9db1da8
Author: Andras Timar 
Date:   Wed May 23 15:52:06 2018 +0200

Help translations should take precedence (stray ~ chars were detected in 
German help)

Change-Id: I86b4a04abc29855f565b36cd2c68d15730e2eecf

diff --git a/loleaflet/debug/document/loleaflet.html 
b/loleaflet/debug/document/loleaflet.html
index 17244e7ef..429da430e 100644
--- a/loleaflet/debug/document/loleaflet.html
+++ b/loleaflet/debug/document/loleaflet.html
@@ -29,8 +29,8 @@
 
 
 
-
 
+
 
 
 
diff --git a/loleaflet/loleaflet.html.m4 b/loleaflet/loleaflet.html.m4
index d76df1a27..1a590d273 100644
--- a/loleaflet/loleaflet.html.m4
+++ b/loleaflet/loleaflet.html.m4
@@ -29,8 +29,8 @@ ifelse(DEBUG,[true],foreachq([fileCSS],[LOLEAFLET_CSS],[ 
 
 
-
 
+
 
 
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loleaflet/debug loleaflet/dist

2018-04-05 Thread Henry Castro

 loleaflet/debug/document/loleaflet.html |1 
 loleaflet/dist/loleaflet.css|9 ---
 loleaflet/dist/loleaflet.html.m4|1 
 loleaflet/dist/toolbar.css  |2 
 loleaflet/dist/toolbar/toolbar.js   |   94 
 5 files changed, 1 insertion(+), 106 deletions(-)

New commits:
commit 826592458c2c08255c0aeaefa620f1d6b2f97dac
Author: Henry Castro 
Date:   Thu Apr 5 15:04:31 2018 -0400

loleaflet: remove toolbar button "more"

Replace with new feature

w2toolbar:
"If toolbar has too many button that it does not fit the screen the 
overflow buttons will show up.
No need to set any property, the overflow buttons will just appear"

Change-Id: I6217203f9e2502baffa7bfc4cd68e2a1e7a27d15

diff --git a/loleaflet/debug/document/loleaflet.html 
b/loleaflet/debug/document/loleaflet.html
index 2d7a6a758..17244e7ef 100644
--- a/loleaflet/debug/document/loleaflet.html
+++ b/loleaflet/debug/document/loleaflet.html
@@ -79,7 +79,6 @@
 
 
 
-
 
 
 
diff --git a/loleaflet/dist/loleaflet.css b/loleaflet/dist/loleaflet.css
index 8f67261c0..30db2df72 100644
--- a/loleaflet/dist/loleaflet.css
+++ b/loleaflet/dist/loleaflet.css
@@ -90,15 +90,6 @@ body {
 #spreadsheet-row-column-frame.readonly {
top: 30px !important;
 }
-/* There seems to be some bug in w2ui library -
- * when we are in very low screen width, the toolbar-up-more
- * toolbar's width doesn't adjust according to its children toolbar
- * items and truncate all items but one. Lets override the width in
- * mobile mode to prevent that.
- */
-#toolbar-up-more {
-   width: auto !important;
-}
 /* We need to give space for options menu */
 #tb_toolbar-up_item_rightmenupadding {
padding-right: 40px;
diff --git a/loleaflet/dist/loleaflet.html.m4 b/loleaflet/dist/loleaflet.html.m4
index be6ac26ff..0fd1caf07 100644
--- a/loleaflet/dist/loleaflet.html.m4
+++ b/loleaflet/dist/loleaflet.html.m4
@@ -52,7 +52,6 @@ ifelse(debug,[true],[


-   
   
   
 
diff --git a/loleaflet/dist/toolbar.css b/loleaflet/dist/toolbar.css
index 8e78f2bcb..4889eb456 100644
--- a/loleaflet/dist/toolbar.css
+++ b/loleaflet/dist/toolbar.css
@@ -16,7 +16,7 @@
 z-index: 1000;
 }
 
-#toolbar-up-more,w2ui-toolbar {
+w2ui-toolbar {
 position: absolute;
 right: 10px;
 top: 40px;
diff --git a/loleaflet/dist/toolbar/toolbar.js 
b/loleaflet/dist/toolbar/toolbar.js
index f2ee8690f..8a35056b4 100644
--- a/loleaflet/dist/toolbar/toolbar.js
+++ b/loleaflet/dist/toolbar/toolbar.js
@@ -47,7 +47,6 @@ var nUsers, oneUser, noUser;
 
 function _mobilify() {
var toolbarUp = w2ui['toolbar-up'];
-   var toolbarUpMore = w2ui['toolbar-up-more'];
var statusbar = w2ui['toolbar-down'];
 
for (var itemIdx in toolbarUp.items) {
@@ -56,12 +55,6 @@ function _mobilify() {
toolbarUp.hide(id);
}
}
-   for (itemIdx in toolbarUpMore.items) {
-   id = toolbarUpMore.items[itemIdx].id;
-   if (toolbarUpMobileItems.indexOf(id) === -1 && 
toolbarUpMore.get(id) && !toolbarUpMore.get(id).hidden) {
-   toolbarUpMore.hide(id);
-   }
-   }
 
for (itemIdx in statusbar.items) {
id = statusbar.items[itemIdx].id;
@@ -80,7 +73,6 @@ function _mobilify() {
 
 function _unmobilify() {
var toolbarUp = w2ui['toolbar-up'];
-   var toolbarUpMore = w2ui['toolbar-up-more'];
var statusbar = w2ui['toolbar-down'];
 
for (var itemIdx in toolbarUp.items) {
@@ -89,12 +81,6 @@ function _unmobilify() {
toolbarUp.show(id);
}
}
-   for (itemIdx in toolbarUpMore.items) {
-   id = toolbarUpMore.items[itemIdx].id;
-   if (toolbarUpMobileItems.indexOf(id) === -1 && 
toolbarUpMore.get(id) && toolbarUpMore.get(id).hidden) {
-   toolbarUpMore.show(id);
-   }
-   }
 
for (itemIdx in statusbar.items) {
id = statusbar.items[itemIdx].id;
@@ -114,7 +100,6 @@ function _unmobilify() {
 function resizeToolbar() {
var hasMoreItems = false;
var toolbarUp = w2ui['toolbar-up'];
-   var toolbarUpMore = w2ui['toolbar-up-more'];
 
if ($(window).width() < mobileWidth) {
_mobilify();
@@ -123,43 +108,6 @@ function resizeToolbar() {
}
 
toolbarUp.refresh();
-   toolbarUpMore.refresh();
-   // move items from toolbar-up-more -> toolbar-up
-   while ($('#toolbar-up')[0].scrollWidth <= $(window).width()) {
-   var item = toolbarUpMore.items[0];
-   if (!item) {
-   break;
-   }
-   toolbarUpMore.items.shift();
-   toolbarUp.insert('right', item);
-   }

[Libreoffice-commits] online.git: loleaflet/debug loleaflet/dist loleaflet/.gitignore loleaflet/Makefile.am loleaflet/po scripts/layoutsl10n.py scripts/locorestrings.py

2018-01-02 Thread Andras Timar

 loleaflet/.gitignore  |1 
 loleaflet/Makefile.am |8 
 loleaflet/debug/document/loleaflet.html   |2 
 loleaflet/dist/l10n/locore-localizations.json |  124 
 loleaflet/dist/l10n/locore/ab.json|8 
 loleaflet/dist/l10n/locore/af.json|  427 +++
 loleaflet/dist/l10n/locore/am.json|  620 
 loleaflet/dist/l10n/locore/an.json|8 
 loleaflet/dist/l10n/locore/ar.json|  584 
 loleaflet/dist/l10n/locore/as.json|  577 
 loleaflet/dist/l10n/locore/ast.json   |  564 
 loleaflet/dist/l10n/locore/az.json|3 
 loleaflet/dist/l10n/locore/be.json|  604 
 loleaflet/dist/l10n/locore/bg.json|  615 
 loleaflet/dist/l10n/locore/bn-IN.json |  575 
 loleaflet/dist/l10n/locore/bn.json|  467 +++
 loleaflet/dist/l10n/locore/bo.json|  409 ++
 loleaflet/dist/l10n/locore/br.json|  600 
 loleaflet/dist/l10n/locore/brx.json   |  204 +
 loleaflet/dist/l10n/locore/bs.json|  564 
 loleaflet/dist/l10n/locore/ca-valencia.json   |  597 
 loleaflet/dist/l10n/locore/ca.json|  620 
 loleaflet/dist/l10n/locore/cs.json|  612 
 loleaflet/dist/l10n/locore/cy.json|  613 
 loleaflet/dist/l10n/locore/da.json|  615 
 loleaflet/dist/l10n/locore/de.json|  620 
 loleaflet/dist/l10n/locore/dgo.json   |  482 +++
 loleaflet/dist/l10n/locore/dz.json|  253 +
 loleaflet/dist/l10n/locore/el.json|  615 
 loleaflet/dist/l10n/locore/en-GB.json |  620 
 loleaflet/dist/l10n/locore/en-ZA.json |  454 +++
 loleaflet/dist/l10n/locore/eo.json|  613 
 loleaflet/dist/l10n/locore/es.json|  620 
 loleaflet/dist/l10n/locore/et.json|  613 
 loleaflet/dist/l10n/locore/eu.json|  620 
 loleaflet/dist/l10n/locore/fa.json|  405 ++
 loleaflet/dist/l10n/locore/fi.json|  608 
 loleaflet/dist/l10n/locore/fr.json|  620 
 loleaflet/dist/l10n/locore/ga.json|  620 
 loleaflet/dist/l10n/locore/gd.json|  615 
 loleaflet/dist/l10n/locore/gl.json|  614 
 loleaflet/dist/l10n/locore/gu.json|  571 
 loleaflet/dist/l10n/locore/gug.json   |  598 
 loleaflet/dist/l10n/locore/he.json|  578 
 loleaflet/dist/l10n/locore/hi.json|  529 +++
 loleaflet/dist/l10n/locore/hr.json|  613 
 loleaflet/dist/l10n/locore/hsb.json   |  595 
 loleaflet/dist/l10n/locore/hu-Hung.json   |3 
 loleaflet/dist/l10n/locore/hu.json|  614 
 loleaflet/dist/l10n/locore/id.json|  613 
 loleaflet/dist/l10n/locore/is.json|  615 
 loleaflet/dist/l10n/locore/it.json|  615 
 loleaflet/dist/l10n/locore/ja.json|  597 
 loleaflet/dist/l10n/locore/jv.json|   13 
 loleaflet/dist/l10n/locore/ka.json|  239 +
 loleaflet/dist/l10n/locore/kk.json|  613 
 loleaflet/dist/l10n/locore/kl.json|5 
 loleaflet/dist/l10n/locore/km.json|  572 
 loleaflet/dist/l10n/locore/kmr-Latn.json  |  442 +++
 loleaflet/dist/l10n/locore/kn.json|  577 
 loleaflet/dist/l10n/locore/ko.json|  540 +++
 loleaflet/dist/l10n/locore/kok.json   |  475 +++
 loleaflet/dist/l10n/locore/ks.json|  203 +
 loleaflet/dist/l10n/locore/ky.json|3 
 loleaflet/dist/l10n/locore/lb.json|  111 
 loleaflet/dist/l10n/locore/lo.json|  206 +
 loleaflet/dist/l10n/locore/lt.json|  555 
 loleaflet/dist/l10n/locore/lv.json|  603 
 loleaflet/dist/l10n/locore/mai.json   |  259 +
 loleaflet/dist/l10n/locore/mk.json|  422 +++
 loleaflet/dist/l10n/locore/ml.json|  537 +++
 loleaflet/dist/l10n/locore/mn.json|  417 +++
 loleaflet/dist/l10n/locore/mni.json   |  213 +
 loleaflet/dist/l10n/locore/mr.json|  538 +++
 loleaflet/dist/l10n/locore/my.json|  467 +++
 loleaflet/dist/l10n/locore/nb.json|  613 
 loleaflet/dist/l10n/locore/ne.json|  468 +++
 loleaflet/dist/l10n/locore/nl.json|  614 
 loleaflet/dist/l10n/locore/nn.json|  615 
 loleaflet/dist/l10n/locore/nr.json|  296 ++
 loleaflet/dist/l10n/locore/nso.json   |  421 +++
 loleaflet/dist/l10n/locore/oc.json|  615 
 loleaflet/dist/l10n/locore/om.json|  430 +++
 loleaflet/dist/l10n/locore/or.json|  544 +++
 loleaflet/dist/l10n/locore/pa-IN.json |  503 +++
 loleaflet/dist/l10n/locore/pl.json|  603

[Libreoffice-commits] online.git: loleaflet/debug loleaflet/main.js loleaflet/src

2017-11-22 Thread Henry Castro

 loleaflet/debug/document/loleaflet.html  |8 +---
 loleaflet/main.js|7 ---
 loleaflet/src/control/Control.Menubar.js |7 +++
 loleaflet/src/map/handler/Map.WOPI.js|7 ---
 4 files changed, 8 insertions(+), 21 deletions(-)

New commits:
commit f5620db55ffbf5b4c7c2b2181976cb51a62fa141
Author: Henry Castro 
Date:   Tue Nov 21 18:09:23 2017 -0400

loleaflet: replace title parameter with wopi BaseFileName

Change-Id: I4807eec44dd481edc8bc4f8f360b8780c2575c8a
Reviewed-on: https://gerrit.libreoffice.org/45056
Reviewed-by: Jan Holesovsky 
Tested-by: Jan Holesovsky 

diff --git a/loleaflet/debug/document/loleaflet.html 
b/loleaflet/debug/document/loleaflet.html
index 2134f31b..ff9b80f4 100644
--- a/loleaflet/debug/document/loleaflet.html
+++ b/loleaflet/debug/document/loleaflet.html
@@ -100,14 +100,8 @@
 wopiSrc += '?access_header=' + access_header;
 }
 
-
-var filePath = getParameterByName('file_path');
-var title = getParameterByName('title');
-if (title === '') {
-title = 
decodeURIComponent(filePath.substring(filePath.lastIndexOf('/')+1));
-}
-
 var host = '%HOST%';
+var filePath = getParameterByName('file_path');
 var permission = getParameterByName('permission') || 'edit';
 var timestamp = getParameterByName('timestamp');
 var closebutton = getParameterByName('closebutton');
diff --git a/loleaflet/main.js b/loleaflet/main.js
index a08e5054..ca143017 100644
--- a/loleaflet/main.js
+++ b/loleaflet/main.js
@@ -65,11 +65,6 @@ else if (wopiSrc !== '' && access_header !== '') {
 }
 
 var filePath = getParameterByName('file_path');
-var title = getParameterByName('title');
-if (title === '') {
-title = 
decodeURIComponent(filePath.substring(filePath.lastIndexOf('/')+1));
-}
-
 var permission = getParameterByName('permission') || 'edit';
 var timestamp = getParameterByName('timestamp');
 // Shows close button if non-zero value provided
@@ -91,7 +86,6 @@ if (host === '') {
 // TODO: Get rid of these globals
 global.closebutton = closebutton;
 global.revHistoryEnabled = revHistoryEnabled;
-global.title = title;
 global.errorMessages = errorMessages;
 var docURL, docParams;
 var isWopi = false;
@@ -104,7 +98,6 @@ if (wopiSrc != '') {
docParams = {};
 }
 
-document.title = title;
 var map = L.map('map', {
server: host,
doc: docURL,
diff --git a/loleaflet/src/control/Control.Menubar.js 
b/loleaflet/src/control/Control.Menubar.js
index 19464469..fda37f4b 100644
--- a/loleaflet/src/control/Control.Menubar.js
+++ b/loleaflet/src/control/Control.Menubar.js
@@ -2,7 +2,7 @@
 * Control.Menubar
 */
 
-/* global $ _ map title vex revHistoryEnabled closebutton L */
+/* global $ _ map vex revHistoryEnabled closebutton L */
 L.Control.Menubar = L.Control.extend({
// TODO: Some mechanism to stop the need to copy duplicate menus (eg. 
Help)
options: {
@@ -672,9 +672,8 @@ L.Control.Menubar = L.Control.extend({
map.print();
} else if (id.startsWith('downloadas-')) {
var format = id.substring('downloadas-'.length);
-   // remove the extension if any
-   var fileName = title.substr(0, title.lastIndexOf('.')) 
|| title;
-   // check if it is empty
+   var fileName = map['wopi'].BaseFileName;
+   fileName = fileName.substr(0, 
fileName.lastIndexOf('.'));
fileName = fileName === '' ? 'document' : fileName;
map.downloadAs(fileName + '.' + format, format);
} else if (id === 'findandreplace') {
diff --git a/loleaflet/src/map/handler/Map.WOPI.js 
b/loleaflet/src/map/handler/Map.WOPI.js
index 2a00b05d..54278376 100644
--- a/loleaflet/src/map/handler/Map.WOPI.js
+++ b/loleaflet/src/map/handler/Map.WOPI.js
@@ -2,7 +2,7 @@
  * L.WOPI contains WOPI related logic
  */
 
-/* global title w2ui toolbarUpMobileItems resizeToolbar */
+/* global w2ui toolbarUpMobileItems resizeToolbar */
 L.Map.WOPI = L.Handler.extend({
// If the CheckFileInfo call fails on server side, we won't have any 
PostMessageOrigin.
// So use '*' because we still needs to send 'close' message to the 
parent frame which
@@ -198,8 +198,9 @@ L.Map.WOPI = L.Handler.extend({
else if (msg.MessageId === 'Action_Export') {
if (msg.Values) {
var format = msg.Values.Format;
-   var filename = title.substr(0, 
title.lastIndexOf('.')) || title;
-   filename = filename === '' ? 'document' : 
filename;
+   var fileName = this._map['wopi'].BaseFileName;
+   fileName = fileName.substr(0, 
fileName.lastIndexOf('.'));
+

[Libreoffice-commits] online.git: loleaflet/debug loleaflet/main.js loleaflet/src

2017-05-24 Thread Henry Castro

 loleaflet/debug/document/loleaflet.html  |1 +
 loleaflet/main.js|3 +++
 loleaflet/src/control/Control.Menubar.js |6 +-
 3 files changed, 9 insertions(+), 1 deletion(-)

New commits:
commit 5d22b274f8cf8169e78489f770fecbd545174163
Author: Henry Castro 
Date:   Wed May 24 10:28:14 2017 -0400

loleaflet: add parameter to disable 'About' menu

Change-Id: I07fa655b8318f78d7e479a3dc34830ebe5f81a2e

diff --git a/loleaflet/debug/document/loleaflet.html 
b/loleaflet/debug/document/loleaflet.html
index 33364cea..f5462f84 100644
--- a/loleaflet/debug/document/loleaflet.html
+++ b/loleaflet/debug/document/loleaflet.html
@@ -106,6 +106,7 @@
 var permission = getParameterByName('permission') || 'edit';
 var timestamp = getParameterByName('timestamp');
 var closebutton = getParameterByName('closebutton');
+var disableAbout = getParameterByName('disableabout');
 if (wopiSrc === '' && filePath === '') {
 vex.dialog.alert(wrongwopisrc);
 }
diff --git a/loleaflet/main.js b/loleaflet/main.js
index 48200cd9..2fb44b3d 100644
--- a/loleaflet/main.js
+++ b/loleaflet/main.js
@@ -75,6 +75,8 @@ var closebutton = getParameterByName('closebutton');
 var revHistoryEnabled = getParameterByName('revisionhistory');
 // Should the document go inactive or not
 var alwaysActive = getParameterByName('alwaysactive');
+// Disable the about dialog
+var disableAbout = getParameterByName('disableabout');
 // Loleaflet Debug mode
 var debugMode = getParameterByName('debug');
 if (wopiSrc === '' && filePath === '') {
@@ -88,6 +90,7 @@ if (host === '') {
 // TODO: Get rid of these globals
 global.closebutton = closebutton;
 global.revHistoryEnabled = revHistoryEnabled;
+global.disableAbout = disableAbout;
 global.title = title;
 global.errorMessages = errorMessages;
 var docURL, docParams;
diff --git a/loleaflet/src/control/Control.Menubar.js 
b/loleaflet/src/control/Control.Menubar.js
index 8206ab5c..33d2e1e1 100644
--- a/loleaflet/src/control/Control.Menubar.js
+++ b/loleaflet/src/control/Control.Menubar.js
@@ -2,7 +2,7 @@
 * Control.Menubar
 */
 
-/* global $ _ map title vex revHistoryEnabled closebutton */
+/* global $ _ map title vex revHistoryEnabled closebutton disableAbout*/
 L.Control.Menubar = L.Control.extend({
// TODO: Some mechanism to stop the need to copy duplicate menus (eg. 
Help)
options: {
@@ -541,6 +541,10 @@ L.Control.Menubar = L.Control.extend({
_createMenu: function(menu) {
var itemList = [];
for (var i in menu) {
+   if (menu[i].id === 'help' && disableAbout) {
+   menu[i].menu.pop();
+   }
+
if (map._permission === 'readonly' && menu[i].type === 
'menu') {
var found = false;
for (var j in 
this.options.allowedReadonlyMenus) {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loleaflet/debug loleaflet/dist loleaflet/src loolwsd/FileServer.hpp loolwsd/LOOLWSD.cpp loolwsd/test

2016-06-08 Thread Pranav Kant

 loleaflet/debug/document/admin.html  |2 +-
 loleaflet/debug/document/adminAnalytics.html |2 +-
 loleaflet/debug/document/adminSettings.html  |2 +-
 loleaflet/dist/admin/admin.html  |4 ++--
 loleaflet/dist/admin/adminAnalytics.html |4 ++--
 loleaflet/dist/admin/adminSettings.html  |4 ++--
 loleaflet/src/core/Socket.js |2 +-
 loolwsd/FileServer.hpp   |2 +-
 loolwsd/LOOLWSD.cpp  |   15 +++
 loolwsd/test/UnitAdmin.cpp   |8 
 loolwsd/test/helpers.hpp |2 +-
 loolwsd/test/httpwstest.cpp  |6 +++---
 12 files changed, 30 insertions(+), 23 deletions(-)

New commits:
commit 8cc367638f7a0e5da56905510dda76075401cb4e
Author: Pranav Kant 
Date:   Wed Jun 8 15:51:29 2016 +0530

bccu#1871: Add url prefix to websocket urls

Normal websocket connections are now :
/lool/ws/filename

Admin websocket is now :
/lool/adminws/

Change-Id: If39382cb852d89ed0394adbd7fe168fe4767a075
Reviewed-on: https://gerrit.libreoffice.org/26029
Reviewed-by: Jan Holesovsky 
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/loleaflet/debug/document/admin.html 
b/loleaflet/debug/document/admin.html
index 98bc593..891dab8 100644
--- a/loleaflet/debug/document/admin.html
+++ b/loleaflet/debug/document/admin.html
@@ -37,7 +37,7 @@
 vex.defaultOptions.className = 'vex-theme-plain';
 
 
-   var host = 'wss://' + window.location.host + '/adminws/';
+   var host = 'wss://' + window.location.host + '/lool/adminws/';
new AdminSocketOverview(host);
 
 
diff --git a/loleaflet/debug/document/adminAnalytics.html 
b/loleaflet/debug/document/adminAnalytics.html
index 13c124c..1841c56 100644
--- a/loleaflet/debug/document/adminAnalytics.html
+++ b/loleaflet/debug/document/adminAnalytics.html
@@ -38,7 +38,7 @@
 
 
 
-   host = 'wss://' + window.location.host + '/adminws/';
+   host = 'wss://' + window.location.host + '/lool/adminws/';
new AdminSocketAnalytics(host);
 
 
diff --git a/loleaflet/debug/document/adminSettings.html 
b/loleaflet/debug/document/adminSettings.html
index a86b137..5cd3bbc 100644
--- a/loleaflet/debug/document/adminSettings.html
+++ b/loleaflet/debug/document/adminSettings.html
@@ -37,7 +37,7 @@
 
 
 
-   host = 'wss://' + window.location.host + '/adminws/';
+   host = 'wss://' + window.location.host + '/lool/adminws/';
new AdminSocketSettings(host);
 
 
diff --git a/loleaflet/dist/admin/admin.html b/loleaflet/dist/admin/admin.html
index ef4a209..a3369fc 100644
--- a/loleaflet/dist/admin/admin.html
+++ b/loleaflet/dist/admin/admin.html
@@ -44,10 +44,10 @@

[Libreoffice-commits] online.git: loleaflet/debug loleaflet/dist

2016-05-31 Thread Pranav Kant

 loleaflet/debug/document/loleaflet.html |4 ++--
 loleaflet/dist/loleaflet.html   |4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 7e1d3fe87e07010ab4eae10f96d35f5540416114
Author: Pranav Kant 
Date:   Tue May 31 14:33:31 2016 +0530

loleaflet: Consistency

Change-Id: I5962af5731199cf507da0eece0adc7b480f48ce0

diff --git a/loleaflet/debug/document/loleaflet.html 
b/loleaflet/debug/document/loleaflet.html
index 4e03ac0..f0ecc5e 100644
--- a/loleaflet/debug/document/loleaflet.html
+++ b/loleaflet/debug/document/loleaflet.html
@@ -22,8 +22,8 @@
 
 
 
-
-
+
+
 
 
 
diff --git a/loleaflet/dist/loleaflet.html b/loleaflet/dist/loleaflet.html
index bb87b6c..a9f6613 100644
--- a/loleaflet/dist/loleaflet.html
+++ b/loleaflet/dist/loleaflet.html
@@ -22,8 +22,8 @@
 
 
 
-
-
+
+
 https://ajax.googleapis.com/ajax/libs/jqueryui/1.11.1/themes/ui-lightness/jquery-ui.css;>
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loleaflet/debug loleaflet/dist

2016-05-28 Thread Andras Timar

 loleaflet/debug/document/loleaflet.html |   26 --
 loleaflet/dist/loleaflet.html   |   26 --
 2 files changed, 24 insertions(+), 28 deletions(-)

New commits:
commit 9c1ff7ef9673612725bad223cffc5bec086fe013
Author: Andras Timar 
Date:   Sun May 29 00:04:35 2016 +0200

loleaflet: decide UI language early

diff --git a/loleaflet/debug/document/loleaflet.html 
b/loleaflet/debug/document/loleaflet.html
index ba2b8b1..4e03ac0 100644
--- a/loleaflet/debug/document/loleaflet.html
+++ b/loleaflet/debug/document/loleaflet.html
@@ -35,6 +35,18 @@
 
 
 var _ = function (string) {return 
string.toLocaleString();};
+
+function getParameterByName(name) {
+name = name.replace(/[\[]/, "\\[").replace(/[\]]/, "\\]");
+var regex = new RegExp("[\\?&]" + name + "=([^&#]*)"),
+results = regex.exec(location.search);
+return results === null ? "" : results[1].replace(/\+/g, " ");
+}
+var lang = getParameterByName('lang');
+if (lang) {
+String.locale = lang;
+}
+
 
 
 
@@ -78,14 +90,6 @@
 
 
 
-
-function getParameterByName(name) {
-name = name.replace(/[\[]/, "\\[").replace(/[\]]/, "\\]");
-var regex = new RegExp("[\\?&]" + name + "=([^&#]*)"),
-results = regex.exec(location.search);
-return results === null ? "" : results[1].replace(/\+/g, " ");
-}
-
 var wopiSrc = getParameterByName('WOPISrc');
 var access_token = '%ACCESS_TOKEN%';
 if (wopiSrc !== '' && access_token !== '') {
@@ -102,12 +106,6 @@
 var permission = getParameterByName('permission') || 'edit';
 var timestamp = getParameterByName('timestamp');
 var closebutton = getParameterByName('closebutton');
-var lang = getParameterByName('lang');
-if (lang) {
-String.locale = lang;
-wrongwopisrc = _('Wrong WOPISrc, usage: WOPISrc=valid encoded URI, or 
file_path, usage: file_path=/path/to/doc/');
-emptyhosturl = _('The host URL is empty. The loolwsd server is 
probably misconfigured, please contact the administrator.');
-}
 if (wopiSrc === '' && filePath === '') {
 vex.dialog.alert(wrongwopisrc);
 }
diff --git a/loleaflet/dist/loleaflet.html b/loleaflet/dist/loleaflet.html
index 6d5546d..bb87b6c 100644
--- a/loleaflet/dist/loleaflet.html
+++ b/loleaflet/dist/loleaflet.html
@@ -35,6 +35,18 @@