[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-2-0' - loleaflet/dist loleaflet/src

2017-03-20 Thread Pranav Kant 
 loleaflet/dist/loleaflet.css  |4 
 loleaflet/dist/partsPreviewControl.css|2 ++
 loleaflet/src/control/Control.PartsPreview.js |4 ++--
 loleaflet/src/layer/tile/ImpressTileLayer.js  |3 +++
 4 files changed, 11 insertions(+), 2 deletions(-)

New commits:
commit f01eb9482a58e50e2e0af353998894dce03c6c73
Author: Pranav Kant 
Date:   Mon Mar 20 13:58:33 2017 +0530

loleaflet: Slide sorter for draw documents

(cherry picked from commit 064b2508a7bde1e2d3422824cd06bf0f7c915061)

 Conflicts:
loleaflet/src/layer/tile/ImpressTileLayer.js

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

diff --git a/loleaflet/dist/loleaflet.css b/loleaflet/dist/loleaflet.css
index da8a073e..e3f70a16 100644
--- a/loleaflet/dist/loleaflet.css
+++ b/loleaflet/dist/loleaflet.css
@@ -45,6 +45,10 @@ body {
 display: block;
 }
 
+#presentation-controls-wrapper.drawing {
+bottom: 34px; /* Hide the presentation toolbar (insert slide etc.) for 
doctype = drawing */
+}
+
 #presentation-controls-wrapper.readonly {
 top: 30px;
 }
diff --git a/loleaflet/dist/partsPreviewControl.css 
b/loleaflet/dist/partsPreviewControl.css
index 4dc87f95..438b137d 100644
--- a/loleaflet/dist/partsPreviewControl.css
+++ b/loleaflet/dist/partsPreviewControl.css
@@ -19,6 +19,8 @@
}
 
 .preview-img {
+   /* In draw docs, the width of previews are small, but we want a min of 
180px to align it with document's left edge */
+min-width: 180px;
vertical-align: middle;
max-width: 184px;
cursor: pointer;
diff --git a/loleaflet/src/control/Control.PartsPreview.js 
b/loleaflet/src/control/Control.PartsPreview.js
index c4409105..f466be8c 100644
--- a/loleaflet/src/control/Control.PartsPreview.js
+++ b/loleaflet/src/control/Control.PartsPreview.js
@@ -28,7 +28,7 @@ L.Control.PartsPreview = L.Control.extend({
return;
}
 
-   if (docType === 'presentation') {
+   if (docType === 'presentation' || docType === 'drawing') {
if (!this._previewInitialized)
{
// make room for the preview
@@ -145,7 +145,7 @@ L.Control.PartsPreview = L.Control.extend({
},
 
_updatePreview: function (e) {
-   if (this._map.getDocType() === 'presentation') {
+   if (this._map.getDocType() === 'presentation' || 
this._map.getDocType() === 'drawing') {
// the scrollbar has to be re-initialized here else it 
doesn't work
// probably a bug from the scrollbar
this._previewTiles[e.id].onload = function () {
diff --git a/loleaflet/src/layer/tile/ImpressTileLayer.js 
b/loleaflet/src/layer/tile/ImpressTileLayer.js
index da0166c6..c00a4561 100644
--- a/loleaflet/src/layer/tile/ImpressTileLayer.js
+++ b/loleaflet/src/layer/tile/ImpressTileLayer.js
@@ -126,6 +126,9 @@ L.ImpressTileLayer = L.TileLayer.extend({
this._docWidthTwips = command.width;
this._docHeightTwips = command.height;
this._docType = command.type;
+   if (this._docType === 'drawing') {
+   
L.DomUtil.addClass(L.DomUtil.get('presentation-controls-wrapper'), 'drawing');
+   }
this._updateMaxBounds(true);
this._documentInfo = textMsg;
this._parts = command.parts;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-2-0' - loleaflet/dist loleaflet/src

2017-03-18 Thread Pranav Kant 
 loleaflet/dist/toolbar/toolbar.js|3 ++-
 loleaflet/src/control/Control.Menubar.js |2 +-
 loleaflet/src/map/Map.js |8 
 3 files changed, 11 insertions(+), 2 deletions(-)

New commits:
commit 0886b30ea0ad403790bf6e6d784ae0ad7bd72d79
Author: Pranav Kant 
Date:   Fri Mar 17 13:59:38 2017 +0530

loleaflet: Tell WOPI host if document was ever modified by user

Change-Id: Ic99136168716d7a01d1388c4f5e1107ef9e64616
(cherry picked from commit f57e4124035f22d9182c7cda9910e8dc84df5f07)
Reviewed-on: https://gerrit.libreoffice.org/35323
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/loleaflet/dist/toolbar/toolbar.js 
b/loleaflet/dist/toolbar/toolbar.js
index 705a6b74..5fb2df87 100644
--- a/loleaflet/dist/toolbar/toolbar.js
+++ b/loleaflet/dist/toolbar/toolbar.js
@@ -332,7 +332,7 @@ function onClick(id, item, subItem) {
resizeToolbar();
}
else if (id === 'close') {
-   map.fire('postMessage', {msgId: 'UI_Close'});
+   map.fire('postMessage', {msgId: 'UI_Close', args: 
{EverModified: map._everModified}});
map.remove();
}
else if (id === 'specialcharacter') {
@@ -1063,6 +1063,7 @@ map.on('doclayerinit', function () {
resizeToolbar();
 });
 
+
 map.on('commandstatechanged', function (e) {
var toolbar = w2ui['toolbar-up'];
var toolbarUpMore = w2ui['toolbar-up-more'];
diff --git a/loleaflet/src/control/Control.Menubar.js 
b/loleaflet/src/control/Control.Menubar.js
index 279bd6ac..1089f89e 100644
--- a/loleaflet/src/control/Control.Menubar.js
+++ b/loleaflet/src/control/Control.Menubar.js
@@ -471,7 +471,7 @@ L.Control.Menubar = L.Control.extend({
// our host to show revision history mode
map.fire('postMessage', {msgId: 'rev-history'});
} else if (id === 'closedocument') {
-   map.fire('postMessage', {msgId: 'UI_Close'});
+   map.fire('postMessage', {msgId: 'UI_Close', args: 
{EverModified: map._everModified}});
map.remove();
}
else if (id === 'repair') {
diff --git a/loleaflet/src/map/Map.js b/loleaflet/src/map/Map.js
index f3ef565f..6fa000c5 100644
--- a/loleaflet/src/map/Map.js
+++ b/loleaflet/src/map/Map.js
@@ -134,6 +134,14 @@ L.Map = L.Evented.extend({
 
// View color map
this._viewColors = {};
+
+   // This becomes true if document was ever modified by the user
+   this._everModified = false;
+
+   this.on('commandstatechanged', function(e) {
+   if (e.commandName === '.uno:ModifiedStatus')
+   this._everModified = this._everModified || 
(e.state === 'true');
+   }, this);
},
 
// public methods that modify map state
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-2-0' - loleaflet/dist loleaflet/src

2017-02-24 Thread Pranav Kant 
 loleaflet/dist/loleaflet.css |   23 ++
 loleaflet/dist/loleaflet.html|2 -
 loleaflet/dist/menubar.css   |   19 ++--
 loleaflet/dist/spreadsheet.css   |   10 +-
 loleaflet/src/control/Control.Menubar.js |   49 ++-
 loleaflet/src/map/Map.js |   13 ++--
 6 files changed, 96 insertions(+), 20 deletions(-)

New commits:
commit 6fd2e0ab5e5b919b5bfc17a942178e9c8d81a704
Author: Pranav Kant 
Date:   Fri Feb 17 19:54:11 2017 +0530

Minimizing loleaflet UI for readonly documents.

This is a cherry-pick of following commits :

loleaflet: Vanish UI in readonly mode
(cherry picked from commit e4ed4c1ad2a23c919114a973b3eb0e32a6547d67)
loleaflet: Fix readonly UI for impress
(cherry picked from commit c3f9ebb888ac41502c6dd7080063a4d12d1c62ef)
loleaflet: fix readonly UI for spreadsheets
(cherry picked from commit 8fa0bb54bda8c41f594770267c70c13a454e7eaf)

diff --git a/loleaflet/dist/loleaflet.css b/loleaflet/dist/loleaflet.css
index 787a328..da8a073 100644
--- a/loleaflet/dist/loleaflet.css
+++ b/loleaflet/dist/loleaflet.css
@@ -8,6 +8,19 @@
left: 0px;
 }
 
+#document-container.readonly {
+top: 30px;
+}
+
+#toolbar-wrapper.readonly {
+display: none;
+}
+
+#logo.readonly {
+background-size: 100px;
+top: -5px;
+}
+
 #map {
position: absolute;
top: 0px;
@@ -32,6 +45,10 @@ body {
 display: block;
 }
 
+#presentation-controls-wrapper.readonly {
+top: 30px;
+}
+
 @media (max-width: 767px) {
 /* Show slidesorter beyond 768px only */
 #presentation-controls-wrapper {
@@ -44,12 +61,18 @@ body {
 #document-container.spreadsheet-document {
top: 93px !important;
 }
+#document-container.spreadsheet-document.readonly {
+   top: 50px !important;
+}
 #document-container {
top: 40px;
 }
 #spreadsheet-row-column-frame {
top: 73px !important;
 }
+#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
diff --git a/loleaflet/dist/loleaflet.html b/loleaflet/dist/loleaflet.html
index bfb3ed6..cde000b 100644
--- a/loleaflet/dist/loleaflet.html
+++ b/loleaflet/dist/loleaflet.html
@@ -47,7 +47,7 @@


   
-  
+  



diff --git a/loleaflet/dist/menubar.css b/loleaflet/dist/menubar.css
index e7e6a86..70fdaee 100644
--- a/loleaflet/dist/menubar.css
+++ b/loleaflet/dist/menubar.css
@@ -7,6 +7,10 @@
 background-color: transparent;
 }
 
+#main-menu.readonly {
+top: 30px;
+}
+
 .header-wrapper {
 background: #efefef; /* Fill up white areas with grey */
 min-height: 70px; /* Map starts from 70px onwards in case of writer, calc 
*/
@@ -186,10 +190,11 @@
 display: block;
 }
 
-.toolbar-wrapper {
+#toolbar-wrapper {
 position: relative;
 }
 
+/* desktop mode */
 @media (min-width: 768px) {
 /* hide the button in desktop view */
 .main-menu-btn {
@@ -201,13 +206,23 @@
display: block;
 }
 #main-menu {
-   top: 0;
+   top: 0 !important;
 }
 .main-nav {
position: static;
width: auto;
 }
+/*
+ * In desktop mode, we already have the close button from the toolbar
+ */
 #menu-closedocument {
display: none;
 }
+/* In readonly mode, we have no toolbar => no close button,
+ * so only way to close the document is file menu option
+ */
+#menu-closedocument.readonly {
+   display: block;
+   top: 3px; /* This is not a menu, plain action, but we want it to appear 
like a menu */
+}
 }
diff --git a/loleaflet/dist/spreadsheet.css b/loleaflet/dist/spreadsheet.css
index b75b78c..15ea4ff 100644
--- a/loleaflet/dist/spreadsheet.css
+++ b/loleaflet/dist/spreadsheet.css
@@ -3,7 +3,11 @@
 top: 123px;
 left: 50px;
 bottom: 65px;
-   }
+}
+
+#document-container.spreadsheet-document.readonly {
+top: 50px;
+}
 
 .spreadsheet-tabs-container {
margin: 0;
@@ -62,6 +66,10 @@
bottom: 65px;
 }
 
+#spreadsheet-row-column-frame.readonly {
+top: 30px;
+}
+
 .spreadsheet-header-corner {
border: 1px solid darkgrey;
background-color: lightgrey;
diff --git a/loleaflet/src/control/Control.Menubar.js 
b/loleaflet/src/control/Control.Menubar.js
index 4128280..279bd6a 100644
--- a/loleaflet/src/control/Control.Menubar.js
+++ b/loleaflet/src/control/Control.Menubar.js
@@ -7,7 +7,7 @@ L.Control.Menubar = L.Control.extend({
// TODO: Some mechanism to stop the need to copy duplicate menus (eg. 
Help)
options: {
text:  [
-   {name: _('File'), type: 'menu', menu: [
+

[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-2-0' - loleaflet/dist loleaflet/src

2017-01-13 Thread Pranav Kant 
 loleaflet/dist/loleaflet.css  |   27 -
 loleaflet/dist/loleaflet.html |3 +
 loleaflet/dist/menubar.css|   41 ++
 loleaflet/dist/spreadsheet.css|   16 +++---
 loleaflet/dist/toolbar.css|4 +-
 loleaflet/dist/toolbar/toolbar.js |   10 +++---
 loleaflet/src/control/Control.ColumnHeader.js |6 +--
 loleaflet/src/control/Control.Menubar.js  |   29 --
 loleaflet/src/control/Control.RowHeader.js|4 +-
 9 files changed, 90 insertions(+), 50 deletions(-)

New commits:
commit d26a49ddd3bf13125be77d82dac80418e9b866c1
Author: Pranav Kant 
Date:   Thu Jan 12 18:09:28 2017 +0530

loleaflet: Collapse to a single row in mobile mode

Combination of following cherry picks:

loleaflet: Collapse to a single row in mobile mode, more doc space
(cherry picked from commit c20ff7adda74a5ac7cc6f9355a38c9ee5200a2f0)

loleaflet: Put row column in a container

Change-Id: Ib271a690783c51d19e3fd6c1634620740051e3bc
(cherry picked from commit 15ed828698f12d690b2226f3b409a5e03e8a7650)

Position row/col headers absolutely inside header frame

... so that its easy to move all of it when we switch from mobile
mode and vice versa.

Change-Id: If2db351aafc4a8fefa05bc88f73c0046a3f887b8
(cherry picked from commit 54e2b237b6bc4b1b2c3ab4d6563d243a77d63b6f)

loleaflet: No need of resizebreak now

... as we have a mobile mode now where we remove drop downs
anyways.

Change-Id: Ic08634d25d6a3ae272e50642f34d2124c0472bf5
(cherry picked from commit 77b27255f1ae787e43edc29137e3be556a9d6040)

loleaflet: right padding for hamburger option menu

Change-Id: I1d946f537e66d637e82354ff3af80353a930d8eb
(cherry picked from commit 21d3ef8c3362064303e9536756d7139463e7feb5)

loleaflet: Remove useless rule

This seems to be superfluous. w2ui library automatically set the
width of the toolbar overriding this value always.

Change-Id: Ia87018533f99769ef1dc48463ac58d32cbf40d9d
(cherry picked from commit 17e2d42e9ed284e7fa163227328b72426ce10a7e)

loleaflet: Set toolbar-up-more width to auto in low screen width

Change-Id: I10c41630da3a3003db1663bea211b42335f468c8
(cherry picked from commit 9b564af0034330617377b1fae9f96ef2d5f22863)

loleaflet: Move closebutton to menu bar option in mobile mode

Change-Id: Ie6b9f507862e36ada44fda88acd96b1b495ae002
(cherry picked from commit 456afb50bd3487a4e5637ddf1857fa8b540aabfb)

loleaflet: Remove this hamburger <-> closebutton animation

Change-Id: I0c5a4ad2ee0b1d7041091d54c21f538c1a2912f8
(cherry picked from commit 9a4aba717a8b531d0f84e90f7c554497be9e2ef6)
Reviewed-on: https://gerrit.libreoffice.org/33004
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/loleaflet/dist/loleaflet.css b/loleaflet/dist/loleaflet.css
index c8c5889..787a328 100644
--- a/loleaflet/dist/loleaflet.css
+++ b/loleaflet/dist/loleaflet.css
@@ -32,7 +32,7 @@ body {
 display: block;
 }
 
-@media (max-width: 768px) {
+@media (max-width: 767px) {
 /* Show slidesorter beyond 768px only */
 #presentation-controls-wrapper {
display: none;
@@ -41,6 +41,31 @@ body {
 #document-container.parts-preview-document {
left: 0px !important;
 }
+#document-container.spreadsheet-document {
+   top: 93px !important;
+}
+#document-container {
+   top: 40px;
+}
+#spreadsheet-row-column-frame {
+   top: 73px !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;
+}
+#tb_toolbar-up_item_close {
+   display: none;
+}
 }
 
 .loleaflet-font {
diff --git a/loleaflet/dist/loleaflet.html b/loleaflet/dist/loleaflet.html
index d7a9186..bfb3ed6 100644
--- a/loleaflet/dist/loleaflet.html
+++ b/loleaflet/dist/loleaflet.html
@@ -55,6 +55,9 @@
   
 
 
+
+
+
 
   
 
diff --git a/loleaflet/dist/menubar.css b/loleaflet/dist/menubar.css
index 72c8926..e7e6a86 100644
--- a/loleaflet/dist/menubar.css
+++ b/loleaflet/dist/menubar.css
@@ -1,9 +1,10 @@
 #main-menu {
-top: 30px;
+top: 39px;
 height: 25px;
 padding-left: 125px;
 z-index: 1000;
 outline: none;
+background-color: transparent;
 }
 
 .header-wrapper {
@@

[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-2-0' - loleaflet/dist loleaflet/src

2017-01-12 Thread Pranav Kant 
 loleaflet/dist/toolbar/toolbar.js |4 
 loleaflet/src/control/Toolbar.js  |6 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

New commits:
commit b1dabb4b818480fe107c0705a736d6b94289ec35
Author: Pranav Kant 
Date:   Thu Jan 12 19:10:12 2017 +0530

loleaflet: Avoid a race condition

There was a race condition here between our toolbar doing its
stuff and loolwsd sending us websocket messages, noticeable on
slow networks.

Change-Id: I5ae174e94561dd427d22389e443c80b2a6be4ec4
(cherry picked from commit 8afcc582bef39630b6e899bbd79b3f5ca7c348d6)
Reviewed-on: https://gerrit.libreoffice.org/32995
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/loleaflet/dist/toolbar/toolbar.js 
b/loleaflet/dist/toolbar/toolbar.js
index 3572b28..d1734e7 100644
--- a/loleaflet/dist/toolbar/toolbar.js
+++ b/loleaflet/dist/toolbar/toolbar.js
@@ -1368,6 +1368,10 @@ function updateCommandValues() {
}
 }
 
+map.on('updatetoolbarcommandvalues', function(e) {
+   w2ui['toolbar-up'].refresh();
+});
+
 map.on('updateparts pagenumberchanged', function (e) {
if (e.docType === 'text') {
var current = e.currentPage;
diff --git a/loleaflet/src/control/Toolbar.js b/loleaflet/src/control/Toolbar.js
index 466d698..8d229f5 100644
--- a/loleaflet/src/control/Toolbar.js
+++ b/loleaflet/src/control/Toolbar.js
@@ -44,7 +44,11 @@ L.Map.include({
},
 
getToolbarCommandValues: function (command) {
-   return this._docLayer._toolbarCommandValues[command];
+   if (this._docLayer) {
+   return this._docLayer._toolbarCommandValues[command];
+   }
+
+   return undefined;
},
 
downloadAs: function (name, format, options, id) {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-2-0' - loleaflet/dist loleaflet/src

2016-12-19 Thread Henry Castro 
 loleaflet/dist/toolbar/toolbar.js|8 
 loleaflet/src/control/Control.Menubar.js |4 +++-
 2 files changed, 7 insertions(+), 5 deletions(-)

New commits:
commit d694ac0a9cc2a781fd6aa71400e3e3db92c9d26f
Author: Henry Castro 
Date:   Fri Dec 16 22:34:53 2016 -0400

Revert "disable 'Insert Special Character' for Impress"

This reverts commit 0e786d14a0681e5ff9e8b421704593972e0c0a27.

Change-Id: I9e301d7d2b6e7d2626de91c242b7617faa823572
Reviewed-on: https://gerrit.libreoffice.org/32109
Reviewed-by: Michael Meeks 
Tested-by: Michael Meeks 

diff --git a/loleaflet/dist/toolbar/toolbar.js 
b/loleaflet/dist/toolbar/toolbar.js
index 2c14936..191011d 100644
--- a/loleaflet/dist/toolbar/toolbar.js
+++ b/loleaflet/dist/toolbar/toolbar.js
@@ -851,8 +851,8 @@ map.on('doclayerinit', function () {
case 'presentation':
var presentationToolbar = w2ui['presentation-toolbar'];
presentationToolbar.show('presentation', 'presentationbreak', 
'insertpage', 'duplicatepage', 'deletepage');
-   toolbarUp.remove('annotation', 'wraptext', 'togglemergecells', 
'break-toggle', 'numberformatcurrency', 'numberformatpercent', 
'numberformatdecimal', 'numberformatdate', 'numberformatincdecimals', 
'numberformatdecdecimals', 'break-number', 'sortascending', 'sortdescending', 
'specialcharacter');
-   toolbarUpMore.remove('annotation', 'wraptext', 
'togglemergecells', 'break-toggle', 'numberformatcurrency', 
'numberformatpercent', 'numberformatdecimal', 'numberformatdate', 
'numberformatincdecimals', 'numberformatdecdecimals', 'break-number', 
'sortascending', 'sortdescending', 'specialcharacter');
+   toolbarUp.remove('annotation', 'wraptext', 'togglemergecells', 
'break-toggle', 'numberformatcurrency', 'numberformatpercent', 
'numberformatdecimal', 'numberformatdate', 'numberformatincdecimals', 
'numberformatdecdecimals', 'break-number', 'sortascending', 'sortdescending');
+   toolbarUpMore.remove('annotation', 'wraptext', 
'togglemergecells', 'break-toggle', 'numberformatcurrency', 
'numberformatpercent', 'numberformatdecimal', 'numberformatdate', 
'numberformatincdecimals', 'numberformatdecdecimals', 'break-number', 
'sortascending', 'sortdescending');
statusbar.insert('left', [
{type: 'break', id:'break1'},
{type: 'html',  id: 'PageStatus',
@@ -860,8 +860,8 @@ map.on('doclayerinit', function () {
]);
break;
case 'drawing':
-   toolbarUp.remove('annotation', 'wraptext', 'togglemergecells', 
'break-toggle', 'numberformatcurrency', 'numberformatpercent', 
'numberformatdecimal', 'numberformatdate', 'numberformatincdecimals', 
'numberformatdecdecimals', 'break-number', 'sortascending', 'sortdescending', 
'specialcharacter');
-   toolbarUpMore.remove('annotation', 'wraptext', 
'togglemergecells', 'break-toggle', 'numberformatcurrency', 
'numberformatpercent', 'numberformatdecimal', 'numberformatdate', 
'numberformatincdecimals', 'numberformatdecdecimals', 'break-number', 
'sortascending', 'sortdescending', 'specialcharacter');
+   toolbarUp.remove('annotation', 'wraptext', 'togglemergecells', 
'break-toggle', 'numberformatcurrency', 'numberformatpercent', 
'numberformatdecimal', 'numberformatdate', 'numberformatincdecimals', 
'numberformatdecdecimals', 'break-number', 'sortascending', 'sortdescending');
+   toolbarUpMore.remove('annotation', 'wraptext', 
'togglemergecells', 'break-toggle', 'numberformatcurrency', 
'numberformatpercent', 'numberformatdecimal', 'numberformatdate', 
'numberformatincdecimals', 'numberformatdecdecimals', 'break-number', 
'sortascending', 'sortdescending');
break;
}
toolbarUp.refresh();
diff --git a/loleaflet/src/control/Control.Menubar.js 
b/loleaflet/src/control/Control.Menubar.js
index 4da078a..e854d5b 100644
--- a/loleaflet/src/control/Control.Menubar.js
+++ b/loleaflet/src/control/Control.Menubar.js
@@ -187,7 +187,9 @@ L.Control.Menubar = L.Control.extend({
{name: _('Reset zoom'), id: 'zoomreset', type: 
'action'}]
},
{name: _('Insert'), type: 'menu', menu: [
-   {name: _('Image'), id: 'insertgraphic', type: 
'action'}]
+   {name: _('Image'), id: 'insertgraphic', type: 
'action'},
+   {type: 'separator'},
+   {name: _('Special character...'), id: 
'specialcharacter', type: 'action'}]
},
{name: _('Tables'), type: 'menu', menu: [
{name: _('Insert'), type: 'menu', menu: [
___
Libreoffice-commits mailing

[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-2-0' - loleaflet/dist loleaflet/src

2016-12-05 Thread Andras Timar 
 loleaflet/dist/toolbar/toolbar.js|8 
 loleaflet/src/control/Control.Menubar.js |4 +---
 2 files changed, 5 insertions(+), 7 deletions(-)

New commits:
commit be0dd8175aa5fc68ca7307399866c4e77e91aff1
Author: Andras Timar 
Date:   Mon Dec 5 12:41:47 2016 +0100

disable 'Insert Special Character' for Impress

Change-Id: I6c25d2eb68b0f757771a48bd3c732847d28caff7
Reviewed-on: https://gerrit.libreoffice.org/31630
Reviewed-by: pranavk 
Tested-by: pranavk 

diff --git a/loleaflet/dist/toolbar/toolbar.js 
b/loleaflet/dist/toolbar/toolbar.js
index bd8fd10..860fc4c 100644
--- a/loleaflet/dist/toolbar/toolbar.js
+++ b/loleaflet/dist/toolbar/toolbar.js
@@ -795,8 +795,8 @@ map.on('doclayerinit', function () {
case 'presentation':
var presentationToolbar = w2ui['presentation-toolbar'];
presentationToolbar.show('presentation', 'presentationbreak', 
'insertpage', 'duplicatepage', 'deletepage');
-   toolbarUp.remove('annotation', 'wraptext', 'togglemergecells', 
'break-toggle', 'numberformatcurrency', 'numberformatpercent', 
'numberformatdecimal', 'numberformatdate', 'numberformatincdecimals', 
'numberformatdecdecimals', 'break-number', 'sortascending', 'sortdescending');
-   toolbarUpMore.remove('annotation', 'wraptext', 
'togglemergecells', 'break-toggle', 'numberformatcurrency', 
'numberformatpercent', 'numberformatdecimal', 'numberformatdate', 
'numberformatincdecimals', 'numberformatdecdecimals', 'break-number', 
'sortascending', 'sortdescending');
+   toolbarUp.remove('annotation', 'wraptext', 'togglemergecells', 
'break-toggle', 'numberformatcurrency', 'numberformatpercent', 
'numberformatdecimal', 'numberformatdate', 'numberformatincdecimals', 
'numberformatdecdecimals', 'break-number', 'sortascending', 'sortdescending', 
'specialcharacter');
+   toolbarUpMore.remove('annotation', 'wraptext', 
'togglemergecells', 'break-toggle', 'numberformatcurrency', 
'numberformatpercent', 'numberformatdecimal', 'numberformatdate', 
'numberformatincdecimals', 'numberformatdecdecimals', 'break-number', 
'sortascending', 'sortdescending', 'specialcharacter');
statusbar.insert('left', [
{type: 'break', id:'break1'},
{type: 'html',  id: 'PageStatus',
@@ -804,8 +804,8 @@ map.on('doclayerinit', function () {
]);
break;
case 'drawing':
-   toolbarUp.remove('annotation', 'wraptext', 'togglemergecells', 
'break-toggle', 'numberformatcurrency', 'numberformatpercent', 
'numberformatdecimal', 'numberformatdate', 'numberformatincdecimals', 
'numberformatdecdecimals', 'break-number', 'sortascending', 'sortdescending');
-   toolbarUpMore.remove('annotation', 'wraptext', 
'togglemergecells', 'break-toggle', 'numberformatcurrency', 
'numberformatpercent', 'numberformatdecimal', 'numberformatdate', 
'numberformatincdecimals', 'numberformatdecdecimals', 'break-number', 
'sortascending', 'sortdescending');
+   toolbarUp.remove('annotation', 'wraptext', 'togglemergecells', 
'break-toggle', 'numberformatcurrency', 'numberformatpercent', 
'numberformatdecimal', 'numberformatdate', 'numberformatincdecimals', 
'numberformatdecdecimals', 'break-number', 'sortascending', 'sortdescending', 
'specialcharacter');
+   toolbarUpMore.remove('annotation', 'wraptext', 
'togglemergecells', 'break-toggle', 'numberformatcurrency', 
'numberformatpercent', 'numberformatdecimal', 'numberformatdate', 
'numberformatincdecimals', 'numberformatdecdecimals', 'break-number', 
'sortascending', 'sortdescending', 'specialcharacter');
break;
}
toolbarUp.refresh();
diff --git a/loleaflet/src/control/Control.Menubar.js 
b/loleaflet/src/control/Control.Menubar.js
index e854d5b..4da078a 100644
--- a/loleaflet/src/control/Control.Menubar.js
+++ b/loleaflet/src/control/Control.Menubar.js
@@ -187,9 +187,7 @@ L.Control.Menubar = L.Control.extend({
{name: _('Reset zoom'), id: 'zoomreset', type: 
'action'}]
},
{name: _('Insert'), type: 'menu', menu: [
-   {name: _('Image'), id: 'insertgraphic', type: 
'action'},
-   {type: 'separator'},
-   {name: _('Special character...'), id: 
'specialcharacter', type: 'action'}]
+   {name: _('Image'), id: 'insertgraphic', type: 
'action'}]
},
{name: _('Tables'), type: 'menu', menu: [
{name: _('Insert'), type: 'menu', menu: [
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org