dev/null |binary loleaflet/Makefile | 2 loleaflet/build/deps.js | 71 ------- loleaflet/debug/document/document_simple_example.html | 125 ------------- loleaflet/dist/images/layers-2x.png |binary loleaflet/dist/images/layers.png |binary loleaflet/dist/images/lc26049.png |binary loleaflet/dist/images/lc_accepttrackedchanges.png |binary loleaflet/dist/images/lc_alignblock.png |binary loleaflet/dist/images/lc_alignhorizontalcenter.png |binary loleaflet/dist/images/lc_alignleft.png |binary loleaflet/dist/images/lc_alignright.png |binary loleaflet/dist/images/lc_autosum.png |binary loleaflet/dist/images/lc_backcolor.png |binary loleaflet/dist/images/lc_bold.png |binary loleaflet/dist/images/lc_cancel.png |binary loleaflet/dist/images/lc_closedoc.png |binary loleaflet/dist/images/lc_color.png |binary loleaflet/dist/images/lc_decrementindent.png |binary loleaflet/dist/images/lc_decrementlevel.png |binary loleaflet/dist/images/lc_defaultbullet.png |binary loleaflet/dist/images/lc_defaultnumbering.png |binary loleaflet/dist/images/lc_deletepage.png |binary loleaflet/dist/images/lc_dia.png |binary loleaflet/dist/images/lc_downsearch.png |binary loleaflet/dist/images/lc_duplicatepage.png |binary loleaflet/dist/images/lc_editdoc.png |binary loleaflet/dist/images/lc_firstrecord.png |binary loleaflet/dist/images/lc_gallery.png |binary loleaflet/dist/images/lc_helpindex.png |binary loleaflet/dist/images/lc_insertpage.png |binary loleaflet/dist/images/lc_italic.png |binary loleaflet/dist/images/lc_lastrecord.png |binary loleaflet/dist/images/lc_nextrecord.png |binary loleaflet/dist/images/lc_prevrecord.png |binary loleaflet/dist/images/lc_print.png |binary loleaflet/dist/images/lc_redo.png |binary loleaflet/dist/images/lc_save.png |binary loleaflet/dist/images/lc_saveas.png |binary loleaflet/dist/images/lc_showannotations.png |binary loleaflet/dist/images/lc_strikeout.png |binary loleaflet/dist/images/lc_underline.png |binary loleaflet/dist/images/lc_undo.png |binary loleaflet/dist/images/lc_upsearch.png |binary loleaflet/dist/images/lc_view100.png |binary loleaflet/dist/images/marker-icon-2x.png |binary loleaflet/dist/images/marker-icon.png |binary loleaflet/dist/images/minus.png |binary loleaflet/dist/images/plus.png |binary loleaflet/dist/images/sc26049.png |binary loleaflet/dist/images/sc_alignhorizontalcenter.png |binary loleaflet/dist/images/sc_decrementlevel.png |binary loleaflet/dist/images/sc_defaultbullet.png |binary loleaflet/dist/images/sc_defaultnumbering.png |binary loleaflet/dist/images/sc_dia.png |binary loleaflet/dist/images/sc_downsearch.png |binary loleaflet/dist/images/sc_editdoc.png |binary loleaflet/dist/images/sc_helpindex.png |binary loleaflet/dist/images/sc_showannotations.png |binary loleaflet/dist/images/sc_upsearch.png |binary loleaflet/dist/loleaflet.css | 4 loleaflet/dist/partsPreviewControl.css | 4 loleaflet/dist/spreadsheet.css | 27 +- loleaflet/dist/toolbar.css | 112 ++++++----- loleaflet/dist/toolbar/toolbar.js | 2 loleaflet/reference.html | 68 ------- loleaflet/src/control/Control.Buttons.js | 171 ------------------ loleaflet/src/control/Control.Fonts.js | 147 --------------- loleaflet/src/control/Control.Formulabar.js | 28 -- loleaflet/src/control/Control.InsertImg.js | 25 -- loleaflet/src/control/Control.Parts.js | 104 ---------- loleaflet/src/control/Control.Presentation.js | 109 ----------- loleaflet/src/control/Control.Search.js | 135 -------------- loleaflet/src/control/Control.StatusIndicator.js | 34 --- loleaflet/src/control/Control.Styles.js | 149 --------------- loleaflet/src/control/Control.Zoom.js | 102 ---------- 76 files changed, 82 insertions(+), 1337 deletions(-)
New commits: commit 58e7bfd97173e82eb6719ac77e855855956bf4c2 Author: Jan Holesovsky <[email protected]> Date: Thu May 19 00:33:46 2016 +0200 loleaflet: Adjust various css values to the large icons. diff --git a/loleaflet/dist/loleaflet.css b/loleaflet/dist/loleaflet.css index 2b0788f..15aaa66 100644 --- a/loleaflet/dist/loleaflet.css +++ b/loleaflet/dist/loleaflet.css @@ -1,9 +1,9 @@ #document-container { - border-top: 2px solid #B6B6B6; + border-top: 1px solid #B6B6B6; background: #DFDFDF; position: absolute; top: 47px; - bottom: 29px; + bottom: 33px; right: 0px; left: 0px; } diff --git a/loleaflet/dist/partsPreviewControl.css b/loleaflet/dist/partsPreviewControl.css index 78ef960..946aa6b 100644 --- a/loleaflet/dist/partsPreviewControl.css +++ b/loleaflet/dist/partsPreviewControl.css @@ -7,10 +7,10 @@ position: absolute; top: 47px; left: 0px; - bottom: 29px; + bottom: 33px; max-width: 214px; overflow: hidden; - border-top: 2px solid #B6B6B6; + border-top: 1px solid #B6B6B6; } .preview-frame { diff --git a/loleaflet/dist/spreadsheet.css b/loleaflet/dist/spreadsheet.css index 53f8806..bce6aee 100644 --- a/loleaflet/dist/spreadsheet.css +++ b/loleaflet/dist/spreadsheet.css @@ -2,19 +2,19 @@ border-top: 1px solid #B6B6B6 !important; top: 100px !important; left: 50px !important; - bottom: 56px !important; + bottom: 65px !important; } .spreadsheet-tab { margin: 0; padding: 0; - left: 108px; + left: 140px; right: 0; bottom: 33px; position: absolute; cursor: pointer; - height: 24px; - overflow-x: hidden; + height: 32px; + overflow: hidden; white-space: nowrap; background-color: #efefef; @@ -31,11 +31,12 @@ .spreadsheet-context-menu { margin: 0px; + margin-top: 2px; margin-right: 3px; - padding-left: 7px; - padding-right: 7px; - padding-top: 1px; - padding-bottom: 1px; + padding-left: 9px; + padding-right: 9px; + padding-top: 3px; + padding-bottom: 3px; font: 12px/1.5 "Helvetica Neue", Arial, Helvetica, sans-serif; display: inline-block; @@ -47,10 +48,10 @@ .spreadsheet-context-menu-selected { background: white !important; color: black !important; - border-top: 1px solid lightgrey; - border-left: 1px solid lightgrey; - border-right: 1px solid lightgrey; - border-bottom: 1px solid lightgrey; + margin-top: 0px; + padding-top: 6px; + border: 1px solid #dfdfdf; + border-top: 0px; } .spreadsheet-context-menu.context-menu-disabled { @@ -137,7 +138,7 @@ left: 0; top: 100px; width: 48px; - bottom: 57px; + bottom: 65px; overflow: hidden; } diff --git a/loleaflet/dist/toolbar.css b/loleaflet/dist/toolbar.css index ddbd508..62bb5c6 100644 --- a/loleaflet/dist/toolbar.css +++ b/loleaflet/dist/toolbar.css @@ -11,7 +11,9 @@ left: 0; right: 0; text-align: center; - padding: 10px; + padding: 6px; + padding-top: 7px; + padding-bottom: 5px; z-index: 1000; } @@ -30,7 +32,7 @@ right: 10px; width: 200px; top: 40px; - border: 1px solid black; + border: 1px solid darkgrey; z-index: 8000; display: none; } @@ -77,9 +79,18 @@ width: 100%; } +/*.w2ui-icon{ + background-repeat:no-repeat; + height:16px; + width:16px; + overflow:hidden; + margin:2px; + display:inline-block +}*/ + .w2ui-tb-image { - width: 16px; - height: 16px; + width: 24px !important; + height: 24px !important; } .leaflet-bar a { @@ -175,8 +186,8 @@ button.leaflet-control-search-next .font-color-indicator, .back-color-indicator { - width: 16px; - height: 5px; + width: 24px; + height: 6px; margin-top: -7px !important; margin-left: 5px !important; position: fixed; diff --git a/loleaflet/dist/toolbar/toolbar.js b/loleaflet/dist/toolbar/toolbar.js index 6b89303..1b59006 100644 --- a/loleaflet/dist/toolbar/toolbar.js +++ b/loleaflet/dist/toolbar/toolbar.js @@ -133,6 +133,7 @@ $(function () { items: [ { type: 'html', id: 'left' }, { type: 'button', id: 'presentation', img: 'presentation', hidden:true, hint: _("Fullscreen presentation") }, + { type: 'break', id: 'presentationbreak', hidden:true }, { type: 'button', id: 'insertpage', img: 'insertpage', hidden:true, hint: _("Insert Page") }, { type: 'button', id: 'duplicatepage', img: 'duplicatepage', hidden:true, hint: _("Duplicate Page") }, { type: 'button', id: 'deletepage', img: 'deletepage', hidden:true, hint: _("Delete Page") }, @@ -575,6 +576,7 @@ map.on('updatepermission', function (e) { toolbar = w2ui['presentation-toolbar']; toolbar.show('presentation'); + toolbar.show('presentationbreak'); toolbar.show('insertpage'); toolbar.show('duplicatepage'); toolbar.show('deletepage'); commit 4d539a5cd36b4d25a80e569f12f8577de15e03a4 Author: Jan Holesovsky <[email protected]> Date: Wed May 18 15:04:18 2016 +0200 loleaflet: Switch to using large icons. Kept the small icons around for the case we'd like to implement switching between these two (?) - OTOH not sure it makes sense, as the toolbars will not get smaller by just using the smaller icons... But always can remove them in a separate commit. diff --git a/loleaflet/dist/images/lc26049.png b/loleaflet/dist/images/lc26049.png new file mode 100644 index 0000000..47b79bb Binary files /dev/null and b/loleaflet/dist/images/lc26049.png differ diff --git a/loleaflet/dist/images/lc_accepttrackedchanges.png b/loleaflet/dist/images/lc_accepttrackedchanges.png new file mode 100644 index 0000000..5a50d28 Binary files /dev/null and b/loleaflet/dist/images/lc_accepttrackedchanges.png differ diff --git a/loleaflet/dist/images/lc_alignblock.png b/loleaflet/dist/images/lc_alignblock.png new file mode 100644 index 0000000..1632a7b Binary files /dev/null and b/loleaflet/dist/images/lc_alignblock.png differ diff --git a/loleaflet/dist/images/lc_alignhorizontalcenter.png b/loleaflet/dist/images/lc_alignhorizontalcenter.png new file mode 100644 index 0000000..5b787d5 Binary files /dev/null and b/loleaflet/dist/images/lc_alignhorizontalcenter.png differ diff --git a/loleaflet/dist/images/lc_alignleft.png b/loleaflet/dist/images/lc_alignleft.png new file mode 100644 index 0000000..47a03aa Binary files /dev/null and b/loleaflet/dist/images/lc_alignleft.png differ diff --git a/loleaflet/dist/images/lc_alignright.png b/loleaflet/dist/images/lc_alignright.png new file mode 100644 index 0000000..8de04c0 Binary files /dev/null and b/loleaflet/dist/images/lc_alignright.png differ diff --git a/loleaflet/dist/images/lc_autosum.png b/loleaflet/dist/images/lc_autosum.png new file mode 100644 index 0000000..76f1840 Binary files /dev/null and b/loleaflet/dist/images/lc_autosum.png differ diff --git a/loleaflet/dist/images/lc_backcolor.png b/loleaflet/dist/images/lc_backcolor.png new file mode 100644 index 0000000..f8f11c4 Binary files /dev/null and b/loleaflet/dist/images/lc_backcolor.png differ diff --git a/loleaflet/dist/images/lc_bold.png b/loleaflet/dist/images/lc_bold.png new file mode 100644 index 0000000..e1b5820 Binary files /dev/null and b/loleaflet/dist/images/lc_bold.png differ diff --git a/loleaflet/dist/images/lc_cancel.png b/loleaflet/dist/images/lc_cancel.png new file mode 100644 index 0000000..9e65d05 Binary files /dev/null and b/loleaflet/dist/images/lc_cancel.png differ diff --git a/loleaflet/dist/images/lc_closedoc.png b/loleaflet/dist/images/lc_closedoc.png new file mode 100644 index 0000000..361881b Binary files /dev/null and b/loleaflet/dist/images/lc_closedoc.png differ diff --git a/loleaflet/dist/images/lc_color.png b/loleaflet/dist/images/lc_color.png new file mode 100644 index 0000000..5280680 Binary files /dev/null and b/loleaflet/dist/images/lc_color.png differ diff --git a/loleaflet/dist/images/lc_decrementindent.png b/loleaflet/dist/images/lc_decrementindent.png new file mode 100644 index 0000000..b2a6c72 Binary files /dev/null and b/loleaflet/dist/images/lc_decrementindent.png differ diff --git a/loleaflet/dist/images/lc_decrementlevel.png b/loleaflet/dist/images/lc_decrementlevel.png new file mode 100644 index 0000000..5cedff3 Binary files /dev/null and b/loleaflet/dist/images/lc_decrementlevel.png differ diff --git a/loleaflet/dist/images/lc_defaultbullet.png b/loleaflet/dist/images/lc_defaultbullet.png new file mode 100644 index 0000000..c446793 Binary files /dev/null and b/loleaflet/dist/images/lc_defaultbullet.png differ diff --git a/loleaflet/dist/images/lc_defaultnumbering.png b/loleaflet/dist/images/lc_defaultnumbering.png new file mode 100644 index 0000000..3f9690e Binary files /dev/null and b/loleaflet/dist/images/lc_defaultnumbering.png differ diff --git a/loleaflet/dist/images/lc_deletepage.png b/loleaflet/dist/images/lc_deletepage.png new file mode 100644 index 0000000..e12688a Binary files /dev/null and b/loleaflet/dist/images/lc_deletepage.png differ diff --git a/loleaflet/dist/images/lc_dia.png b/loleaflet/dist/images/lc_dia.png new file mode 100644 index 0000000..901e61e Binary files /dev/null and b/loleaflet/dist/images/lc_dia.png differ diff --git a/loleaflet/dist/images/lc_downsearch.png b/loleaflet/dist/images/lc_downsearch.png new file mode 100644 index 0000000..3c85e1a Binary files /dev/null and b/loleaflet/dist/images/lc_downsearch.png differ diff --git a/loleaflet/dist/images/lc_duplicatepage.png b/loleaflet/dist/images/lc_duplicatepage.png new file mode 100644 index 0000000..234a362 Binary files /dev/null and b/loleaflet/dist/images/lc_duplicatepage.png differ diff --git a/loleaflet/dist/images/lc_editdoc.png b/loleaflet/dist/images/lc_editdoc.png new file mode 100644 index 0000000..a762031 Binary files /dev/null and b/loleaflet/dist/images/lc_editdoc.png differ diff --git a/loleaflet/dist/images/lc_firstrecord.png b/loleaflet/dist/images/lc_firstrecord.png new file mode 100644 index 0000000..154ffa2 Binary files /dev/null and b/loleaflet/dist/images/lc_firstrecord.png differ diff --git a/loleaflet/dist/images/lc_gallery.png b/loleaflet/dist/images/lc_gallery.png new file mode 100644 index 0000000..51e8228 Binary files /dev/null and b/loleaflet/dist/images/lc_gallery.png differ diff --git a/loleaflet/dist/images/lc_helpindex.png b/loleaflet/dist/images/lc_helpindex.png new file mode 100644 index 0000000..ec7c675 Binary files /dev/null and b/loleaflet/dist/images/lc_helpindex.png differ diff --git a/loleaflet/dist/images/lc_insertpage.png b/loleaflet/dist/images/lc_insertpage.png new file mode 100644 index 0000000..612251d Binary files /dev/null and b/loleaflet/dist/images/lc_insertpage.png differ diff --git a/loleaflet/dist/images/lc_italic.png b/loleaflet/dist/images/lc_italic.png new file mode 100644 index 0000000..5d26144 Binary files /dev/null and b/loleaflet/dist/images/lc_italic.png differ diff --git a/loleaflet/dist/images/lc_lastrecord.png b/loleaflet/dist/images/lc_lastrecord.png new file mode 100644 index 0000000..30714f9 Binary files /dev/null and b/loleaflet/dist/images/lc_lastrecord.png differ diff --git a/loleaflet/dist/images/lc_nextrecord.png b/loleaflet/dist/images/lc_nextrecord.png new file mode 100644 index 0000000..923430c Binary files /dev/null and b/loleaflet/dist/images/lc_nextrecord.png differ diff --git a/loleaflet/dist/images/lc_prevrecord.png b/loleaflet/dist/images/lc_prevrecord.png new file mode 100644 index 0000000..2e46d97 Binary files /dev/null and b/loleaflet/dist/images/lc_prevrecord.png differ diff --git a/loleaflet/dist/images/lc_print.png b/loleaflet/dist/images/lc_print.png new file mode 100644 index 0000000..7ffea95 Binary files /dev/null and b/loleaflet/dist/images/lc_print.png differ diff --git a/loleaflet/dist/images/lc_redo.png b/loleaflet/dist/images/lc_redo.png new file mode 100644 index 0000000..71803bc Binary files /dev/null and b/loleaflet/dist/images/lc_redo.png differ diff --git a/loleaflet/dist/images/lc_save.png b/loleaflet/dist/images/lc_save.png new file mode 100644 index 0000000..b2efa0a Binary files /dev/null and b/loleaflet/dist/images/lc_save.png differ diff --git a/loleaflet/dist/images/lc_saveas.png b/loleaflet/dist/images/lc_saveas.png new file mode 100644 index 0000000..4b952dd Binary files /dev/null and b/loleaflet/dist/images/lc_saveas.png differ diff --git a/loleaflet/dist/images/lc_showannotations.png b/loleaflet/dist/images/lc_showannotations.png new file mode 100644 index 0000000..d40c711 Binary files /dev/null and b/loleaflet/dist/images/lc_showannotations.png differ diff --git a/loleaflet/dist/images/lc_strikeout.png b/loleaflet/dist/images/lc_strikeout.png new file mode 100644 index 0000000..20dae7e Binary files /dev/null and b/loleaflet/dist/images/lc_strikeout.png differ diff --git a/loleaflet/dist/images/lc_underline.png b/loleaflet/dist/images/lc_underline.png new file mode 100644 index 0000000..6a499dc Binary files /dev/null and b/loleaflet/dist/images/lc_underline.png differ diff --git a/loleaflet/dist/images/lc_undo.png b/loleaflet/dist/images/lc_undo.png new file mode 100644 index 0000000..dcf09aa Binary files /dev/null and b/loleaflet/dist/images/lc_undo.png differ diff --git a/loleaflet/dist/images/lc_upsearch.png b/loleaflet/dist/images/lc_upsearch.png new file mode 100644 index 0000000..c113361 Binary files /dev/null and b/loleaflet/dist/images/lc_upsearch.png differ diff --git a/loleaflet/dist/images/lc_view100.png b/loleaflet/dist/images/lc_view100.png new file mode 100644 index 0000000..c3d36ed Binary files /dev/null and b/loleaflet/dist/images/lc_view100.png differ diff --git a/loleaflet/dist/toolbar.css b/loleaflet/dist/toolbar.css index 06b5346..ddbd508 100644 --- a/loleaflet/dist/toolbar.css +++ b/loleaflet/dist/toolbar.css @@ -47,7 +47,7 @@ background: #DFDFDF; left: 0; text-align: center; - bottom: 28px; + bottom: 33px; width: 203px; padding: 0; position: absolute; @@ -188,51 +188,51 @@ button.leaflet-control-search-next border-style: solid; } -.w2ui-icon.accepttrackedchanges{ background: url('/loleaflet/dist/images/sc_accepttrackedchanges.png') no-repeat center !important; } -.w2ui-icon.alignblock{ background: url('/loleaflet/dist/images/sc_alignblock.png') no-repeat center !important; } -.w2ui-icon.alignhorizontal{ background: url('/loleaflet/dist/images/sc_alignhorizontalcenter.png') no-repeat center !important; } -.w2ui-icon.alignleft{ background: url('/loleaflet/dist/images/sc_alignleft.png') no-repeat center !important; } -.w2ui-icon.alignright{ background: url('/loleaflet/dist/images/sc_alignright.png') no-repeat center !important; } -.w2ui-icon.autosum{ background: url('/loleaflet/dist/images/sc_autosum.png') no-repeat center !important; } -.w2ui-icon.backcolor{ background: url('/loleaflet/dist/images/sc_backcolor.png') no-repeat center !important; } -.w2ui-icon.bold{ background: url('/loleaflet/dist/images/sc_bold.png') no-repeat center !important; } -.w2ui-icon.annotation{ background: url('/loleaflet/dist/images/sc_showannotations.png') no-repeat center !important; } -.w2ui-icon.bullet{ background: url('/loleaflet/dist/images/sc_defaultbullet.png') no-repeat center !important; } -.w2ui-icon.cancel{ background: url('/loleaflet/dist/images/sc_cancel.png') no-repeat center !important; } -.w2ui-icon.color{ background: url('/loleaflet/dist/images/sc_color.png') no-repeat center !important; } -.w2ui-icon.closedoc{ background: url('/loleaflet/dist/images/sc_closedoc.png') no-repeat center !important; } -.w2ui-icon.decrementindent{ background: url('/loleaflet/dist/images/sc_decrementindent.png') no-repeat center !important; } -.w2ui-icon.deletepage{ background: url('/loleaflet/dist/images/sc_deletepage.png') no-repeat center !important; } -.w2ui-icon.duplicatepage{ background: url('/loleaflet/dist/images/sc_duplicatepage.png') no-repeat center !important; } -.w2ui-icon.edit{ background: url('/loleaflet/dist/images/sc_editdoc.png') no-repeat center !important; } -.w2ui-icon.equal{ background: url('/loleaflet/dist/images/sc26049.png') no-repeat center !important; } -.w2ui-icon.help{ background: url('/loleaflet/dist/images/sc_helpindex.png') no-repeat center !important; } -.w2ui-icon.incrementindent{ background: url('/loleaflet/dist/images/sc_decrementlevel.png') no-repeat center !important; } -.w2ui-icon.insertpage{ background: url('/loleaflet/dist/images/sc_insertpage.png') no-repeat center !important; } -.w2ui-icon.italic{ background: url('/loleaflet/dist/images/sc_italic.png') no-repeat center !important; } -.w2ui-icon.insertgraphic{ background: url('/loleaflet/dist/images/sc_gallery.png') no-repeat center !important; } -.w2ui-icon.next{ background: url('/loleaflet/dist/images/sc_downsearch.png') no-repeat center !important; } -.w2ui-icon.numbering{ background: url('/loleaflet/dist/images/sc_defaultnumbering.png') no-repeat center !important; } -.w2ui-icon.presentation{ background: url('/loleaflet/dist/images/sc_dia.png') no-repeat center !important; } -.w2ui-icon.prev{ background: url('/loleaflet/dist/images/sc_upsearch.png') no-repeat center !important; } -.w2ui-icon.print{ background: url('/loleaflet/dist/images/sc_print.png') no-repeat center !important; } -.w2ui-icon.redo{ background: url('/loleaflet/dist/images/sc_redo.png') no-repeat center !important; } -.w2ui-icon.save{ background: url('/loleaflet/dist/images/sc_save.png') no-repeat center !important; } -.w2ui-icon.saveas{ background: url('/loleaflet/dist/images/sc_saveas.png') no-repeat center !important; } -.w2ui-icon.strikeout{ background: url('/loleaflet/dist/images/sc_strikeout.png') no-repeat center !important; } -.w2ui-icon.underline{ background: url('/loleaflet/dist/images/sc_underline.png') no-repeat center !important; } -.w2ui-icon.undo{ background: url('/loleaflet/dist/images/sc_undo.png') no-repeat center !important; } +.w2ui-icon.accepttrackedchanges{ background: url('/loleaflet/dist/images/lc_accepttrackedchanges.png') no-repeat center !important; } +.w2ui-icon.alignblock{ background: url('/loleaflet/dist/images/lc_alignblock.png') no-repeat center !important; } +.w2ui-icon.alignhorizontal{ background: url('/loleaflet/dist/images/lc_alignhorizontalcenter.png') no-repeat center !important; } +.w2ui-icon.alignleft{ background: url('/loleaflet/dist/images/lc_alignleft.png') no-repeat center !important; } +.w2ui-icon.alignright{ background: url('/loleaflet/dist/images/lc_alignright.png') no-repeat center !important; } +.w2ui-icon.autosum{ background: url('/loleaflet/dist/images/lc_autosum.png') no-repeat center !important; } +.w2ui-icon.backcolor{ background: url('/loleaflet/dist/images/lc_backcolor.png') no-repeat center !important; } +.w2ui-icon.bold{ background: url('/loleaflet/dist/images/lc_bold.png') no-repeat center !important; } +.w2ui-icon.annotation{ background: url('/loleaflet/dist/images/lc_showannotations.png') no-repeat center !important; } +.w2ui-icon.bullet{ background: url('/loleaflet/dist/images/lc_defaultbullet.png') no-repeat center !important; } +.w2ui-icon.cancel{ background: url('/loleaflet/dist/images/lc_cancel.png') no-repeat center !important; } +.w2ui-icon.color{ background: url('/loleaflet/dist/images/lc_color.png') no-repeat center !important; } +.w2ui-icon.closedoc{ background: url('/loleaflet/dist/images/lc_closedoc.png') no-repeat center !important; } +.w2ui-icon.decrementindent{ background: url('/loleaflet/dist/images/lc_decrementindent.png') no-repeat center !important; } +.w2ui-icon.deletepage{ background: url('/loleaflet/dist/images/lc_deletepage.png') no-repeat center !important; } +.w2ui-icon.duplicatepage{ background: url('/loleaflet/dist/images/lc_duplicatepage.png') no-repeat center !important; } +.w2ui-icon.edit{ background: url('/loleaflet/dist/images/lc_editdoc.png') no-repeat center !important; } +.w2ui-icon.equal{ background: url('/loleaflet/dist/images/lc26049.png') no-repeat center !important; } +.w2ui-icon.help{ background: url('/loleaflet/dist/images/lc_helpindex.png') no-repeat center !important; } +.w2ui-icon.incrementindent{ background: url('/loleaflet/dist/images/lc_decrementlevel.png') no-repeat center !important; } +.w2ui-icon.insertpage{ background: url('/loleaflet/dist/images/lc_insertpage.png') no-repeat center !important; } +.w2ui-icon.italic{ background: url('/loleaflet/dist/images/lc_italic.png') no-repeat center !important; } +.w2ui-icon.insertgraphic{ background: url('/loleaflet/dist/images/lc_gallery.png') no-repeat center !important; } +.w2ui-icon.next{ background: url('/loleaflet/dist/images/lc_downsearch.png') no-repeat center !important; } +.w2ui-icon.numbering{ background: url('/loleaflet/dist/images/lc_defaultnumbering.png') no-repeat center !important; } +.w2ui-icon.presentation{ background: url('/loleaflet/dist/images/lc_dia.png') no-repeat center !important; } +.w2ui-icon.prev{ background: url('/loleaflet/dist/images/lc_upsearch.png') no-repeat center !important; } +.w2ui-icon.print{ background: url('/loleaflet/dist/images/lc_print.png') no-repeat center !important; } +.w2ui-icon.redo{ background: url('/loleaflet/dist/images/lc_redo.png') no-repeat center !important; } +.w2ui-icon.save{ background: url('/loleaflet/dist/images/lc_save.png') no-repeat center !important; } +.w2ui-icon.saveas{ background: url('/loleaflet/dist/images/lc_saveas.png') no-repeat center !important; } +.w2ui-icon.strikeout{ background: url('/loleaflet/dist/images/lc_strikeout.png') no-repeat center !important; } +.w2ui-icon.underline{ background: url('/loleaflet/dist/images/lc_underline.png') no-repeat center !important; } +.w2ui-icon.undo{ background: url('/loleaflet/dist/images/lc_undo.png') no-repeat center !important; } .w2ui-icon.zoomin{ background: url('/loleaflet/dist/images/plus.png') no-repeat center !important; } .w2ui-icon.zoomout{ background: url('/loleaflet/dist/images/minus.png') no-repeat center !important; } -.w2ui-icon.zoomreset{ background: url('/loleaflet/dist/images/sc_view100.png') no-repeat center !important; } -.w2ui-icon.more{ background: url('/loleaflet/dist/images/sc_downsearch.png') no-repeat center !important; } -.w2ui-icon.firstrecord{ background: url('/loleaflet/dist/images/sc_firstrecord.png') no-repeat center !important; } -.w2ui-icon.nextrecord{ background: url('/loleaflet/dist/images/sc_nextrecord.png') no-repeat center !important; } -.w2ui-icon.prevrecord{ background: url('/loleaflet/dist/images/sc_prevrecord.png') no-repeat center !important; } -.w2ui-icon.lastrecord{ background: url('/loleaflet/dist/images/sc_lastrecord.png') no-repeat center !important; } +.w2ui-icon.zoomreset{ background: url('/loleaflet/dist/images/lc_view100.png') no-repeat center !important; } +.w2ui-icon.more{ background: url('/loleaflet/dist/images/lc_downsearch.png') no-repeat center !important; } +.w2ui-icon.firstrecord{ background: url('/loleaflet/dist/images/lc_firstrecord.png') no-repeat center !important; } +.w2ui-icon.nextrecord{ background: url('/loleaflet/dist/images/lc_nextrecord.png') no-repeat center !important; } +.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/sc_closedoc.png') no-repeat; + background:url('/loleaflet/dist/images/lc_closedoc.png') no-repeat; width:25px; height:29px; display:inline; commit b5eee85e20efe9485be79766acb45d20f1c3632a Author: Jan Holesovsky <[email protected]> Date: Wed May 18 14:19:25 2016 +0200 loleaflet: Rename the icons to what is directly in LibreOffice. So that it is easier to update to new version etc. diff --git a/loleaflet/dist/images/sc_zoomout.png b/loleaflet/dist/images/minus.png similarity index 100% rename from loleaflet/dist/images/sc_zoomout.png rename to loleaflet/dist/images/minus.png diff --git a/loleaflet/dist/images/sc_zoomin.png b/loleaflet/dist/images/plus.png similarity index 100% rename from loleaflet/dist/images/sc_zoomin.png rename to loleaflet/dist/images/plus.png diff --git a/loleaflet/dist/images/sc_equal.png b/loleaflet/dist/images/sc26049.png similarity index 100% rename from loleaflet/dist/images/sc_equal.png rename to loleaflet/dist/images/sc26049.png diff --git a/loleaflet/dist/images/sc_alignhorizontal.png b/loleaflet/dist/images/sc_alignhorizontalcenter.png similarity index 100% rename from loleaflet/dist/images/sc_alignhorizontal.png rename to loleaflet/dist/images/sc_alignhorizontalcenter.png diff --git a/loleaflet/dist/images/sc_annotation.png b/loleaflet/dist/images/sc_annotation.png deleted file mode 100644 index 92fe6e5..0000000 Binary files a/loleaflet/dist/images/sc_annotation.png and /dev/null differ diff --git a/loleaflet/dist/images/sc_incrementindent.png b/loleaflet/dist/images/sc_decrementlevel.png similarity index 100% rename from loleaflet/dist/images/sc_incrementindent.png rename to loleaflet/dist/images/sc_decrementlevel.png diff --git a/loleaflet/dist/images/sc_bullet.png b/loleaflet/dist/images/sc_defaultbullet.png similarity index 100% rename from loleaflet/dist/images/sc_bullet.png rename to loleaflet/dist/images/sc_defaultbullet.png diff --git a/loleaflet/dist/images/sc_numbering.png b/loleaflet/dist/images/sc_defaultnumbering.png similarity index 100% rename from loleaflet/dist/images/sc_numbering.png rename to loleaflet/dist/images/sc_defaultnumbering.png diff --git a/loleaflet/dist/images/sc_presentation.png b/loleaflet/dist/images/sc_dia.png similarity index 100% rename from loleaflet/dist/images/sc_presentation.png rename to loleaflet/dist/images/sc_dia.png diff --git a/loleaflet/dist/images/sc_next.png b/loleaflet/dist/images/sc_downsearch.png similarity index 100% rename from loleaflet/dist/images/sc_next.png rename to loleaflet/dist/images/sc_downsearch.png diff --git a/loleaflet/dist/images/sc_edit.png b/loleaflet/dist/images/sc_editdoc.png similarity index 100% rename from loleaflet/dist/images/sc_edit.png rename to loleaflet/dist/images/sc_editdoc.png diff --git a/loleaflet/dist/images/sc_help.png b/loleaflet/dist/images/sc_help.png deleted file mode 100644 index e69233a..0000000 Binary files a/loleaflet/dist/images/sc_help.png and /dev/null differ diff --git a/loleaflet/dist/images/sc_helpindex.png b/loleaflet/dist/images/sc_helpindex.png new file mode 100644 index 0000000..b11665c Binary files /dev/null and b/loleaflet/dist/images/sc_helpindex.png differ diff --git a/loleaflet/dist/images/sc_select.png b/loleaflet/dist/images/sc_select.png deleted file mode 100644 index 6c96a66..0000000 Binary files a/loleaflet/dist/images/sc_select.png and /dev/null differ diff --git a/loleaflet/dist/images/sc_showannotations.png b/loleaflet/dist/images/sc_showannotations.png new file mode 100644 index 0000000..d6e1c96 Binary files /dev/null and b/loleaflet/dist/images/sc_showannotations.png differ diff --git a/loleaflet/dist/images/sc_prev.png b/loleaflet/dist/images/sc_upsearch.png similarity index 100% rename from loleaflet/dist/images/sc_prev.png rename to loleaflet/dist/images/sc_upsearch.png diff --git a/loleaflet/dist/toolbar.css b/loleaflet/dist/toolbar.css index b28bc33..06b5346 100644 --- a/loleaflet/dist/toolbar.css +++ b/loleaflet/dist/toolbar.css @@ -190,43 +190,42 @@ button.leaflet-control-search-next .w2ui-icon.accepttrackedchanges{ background: url('/loleaflet/dist/images/sc_accepttrackedchanges.png') no-repeat center !important; } .w2ui-icon.alignblock{ background: url('/loleaflet/dist/images/sc_alignblock.png') no-repeat center !important; } -.w2ui-icon.alignhorizontal{ background: url('/loleaflet/dist/images/sc_alignhorizontal.png') no-repeat center !important; } +.w2ui-icon.alignhorizontal{ background: url('/loleaflet/dist/images/sc_alignhorizontalcenter.png') no-repeat center !important; } .w2ui-icon.alignleft{ background: url('/loleaflet/dist/images/sc_alignleft.png') no-repeat center !important; } .w2ui-icon.alignright{ background: url('/loleaflet/dist/images/sc_alignright.png') no-repeat center !important; } .w2ui-icon.autosum{ background: url('/loleaflet/dist/images/sc_autosum.png') no-repeat center !important; } .w2ui-icon.backcolor{ background: url('/loleaflet/dist/images/sc_backcolor.png') no-repeat center !important; } .w2ui-icon.bold{ background: url('/loleaflet/dist/images/sc_bold.png') no-repeat center !important; } -.w2ui-icon.annotation{ background: url('/loleaflet/dist/images/sc_annotation.png') no-repeat center !important; } -.w2ui-icon.bullet{ background: url('/loleaflet/dist/images/sc_bullet.png') no-repeat center !important; } +.w2ui-icon.annotation{ background: url('/loleaflet/dist/images/sc_showannotations.png') no-repeat center !important; } +.w2ui-icon.bullet{ background: url('/loleaflet/dist/images/sc_defaultbullet.png') no-repeat center !important; } .w2ui-icon.cancel{ background: url('/loleaflet/dist/images/sc_cancel.png') no-repeat center !important; } .w2ui-icon.color{ background: url('/loleaflet/dist/images/sc_color.png') no-repeat center !important; } .w2ui-icon.closedoc{ background: url('/loleaflet/dist/images/sc_closedoc.png') no-repeat center !important; } .w2ui-icon.decrementindent{ background: url('/loleaflet/dist/images/sc_decrementindent.png') no-repeat center !important; } .w2ui-icon.deletepage{ background: url('/loleaflet/dist/images/sc_deletepage.png') no-repeat center !important; } .w2ui-icon.duplicatepage{ background: url('/loleaflet/dist/images/sc_duplicatepage.png') no-repeat center !important; } -.w2ui-icon.edit{ background: url('/loleaflet/dist/images/sc_edit.png') no-repeat center !important; } -.w2ui-icon.equal{ background: url('/loleaflet/dist/images/sc_equal.png') no-repeat center !important; } -.w2ui-icon.help{ background: url('/loleaflet/dist/images/sc_help.png') no-repeat center !important; } -.w2ui-icon.incrementindent{ background: url('/loleaflet/dist/images/sc_incrementindent.png') no-repeat center !important; } +.w2ui-icon.edit{ background: url('/loleaflet/dist/images/sc_editdoc.png') no-repeat center !important; } +.w2ui-icon.equal{ background: url('/loleaflet/dist/images/sc26049.png') no-repeat center !important; } +.w2ui-icon.help{ background: url('/loleaflet/dist/images/sc_helpindex.png') no-repeat center !important; } +.w2ui-icon.incrementindent{ background: url('/loleaflet/dist/images/sc_decrementlevel.png') no-repeat center !important; } .w2ui-icon.insertpage{ background: url('/loleaflet/dist/images/sc_insertpage.png') no-repeat center !important; } .w2ui-icon.italic{ background: url('/loleaflet/dist/images/sc_italic.png') no-repeat center !important; } .w2ui-icon.insertgraphic{ background: url('/loleaflet/dist/images/sc_gallery.png') no-repeat center !important; } -.w2ui-icon.next{ background: url('/loleaflet/dist/images/sc_next.png') no-repeat center !important; } -.w2ui-icon.numbering{ background: url('/loleaflet/dist/images/sc_numbering.png') no-repeat center !important; } -.w2ui-icon.presentation{ background: url('/loleaflet/dist/images/sc_presentation.png') no-repeat center !important; } -.w2ui-icon.prev{ background: url('/loleaflet/dist/images/sc_prev.png') no-repeat center !important; } +.w2ui-icon.next{ background: url('/loleaflet/dist/images/sc_downsearch.png') no-repeat center !important; } +.w2ui-icon.numbering{ background: url('/loleaflet/dist/images/sc_defaultnumbering.png') no-repeat center !important; } +.w2ui-icon.presentation{ background: url('/loleaflet/dist/images/sc_dia.png') no-repeat center !important; } +.w2ui-icon.prev{ background: url('/loleaflet/dist/images/sc_upsearch.png') no-repeat center !important; } .w2ui-icon.print{ background: url('/loleaflet/dist/images/sc_print.png') no-repeat center !important; } .w2ui-icon.redo{ background: url('/loleaflet/dist/images/sc_redo.png') no-repeat center !important; } .w2ui-icon.save{ background: url('/loleaflet/dist/images/sc_save.png') no-repeat center !important; } .w2ui-icon.saveas{ background: url('/loleaflet/dist/images/sc_saveas.png') no-repeat center !important; } -.w2ui-icon.select{ background: url('/loleaflet/dist/images/sc_select.png') no-repeat center !important; } .w2ui-icon.strikeout{ background: url('/loleaflet/dist/images/sc_strikeout.png') no-repeat center !important; } .w2ui-icon.underline{ background: url('/loleaflet/dist/images/sc_underline.png') no-repeat center !important; } .w2ui-icon.undo{ background: url('/loleaflet/dist/images/sc_undo.png') no-repeat center !important; } -.w2ui-icon.zoomin{ background: url('/loleaflet/dist/images/sc_zoomin.png') no-repeat center !important; } -.w2ui-icon.zoomout{ background: url('/loleaflet/dist/images/sc_zoomout.png') no-repeat center !important; } +.w2ui-icon.zoomin{ background: url('/loleaflet/dist/images/plus.png') no-repeat center !important; } +.w2ui-icon.zoomout{ background: url('/loleaflet/dist/images/minus.png') no-repeat center !important; } .w2ui-icon.zoomreset{ background: url('/loleaflet/dist/images/sc_view100.png') no-repeat center !important; } -.w2ui-icon.more{ background: url('/loleaflet/dist/images/sc_next.png') no-repeat center !important; } +.w2ui-icon.more{ background: url('/loleaflet/dist/images/sc_downsearch.png') no-repeat center !important; } .w2ui-icon.firstrecord{ background: url('/loleaflet/dist/images/sc_firstrecord.png') no-repeat center !important; } .w2ui-icon.nextrecord{ background: url('/loleaflet/dist/images/sc_nextrecord.png') no-repeat center !important; } .w2ui-icon.prevrecord{ background: url('/loleaflet/dist/images/sc_prevrecord.png') no-repeat center !important; } commit e3b0d002404ceb69051fe9742e4099811c045909 Author: Jan Holesovsky <[email protected]> Date: Wed May 18 10:11:52 2016 +0200 Kill the rest of document_simple_example.html + related controls. [Those that are not used in the loleaflet.html.] diff --git a/loleaflet/build/deps.js b/loleaflet/build/deps.js index 347721d..4ac1b00 100644 --- a/loleaflet/build/deps.js +++ b/loleaflet/build/deps.js @@ -252,34 +252,6 @@ var deps = { desc: 'Makes markers draggable (by mouse or touch).' }, - ControlZoom: { - src: ['control/Control.js', - 'control/Control.Zoom.js'], - heading: 'Controls', - desc: 'Basic zoom control with two buttons (zoom in / zoom out).' - }, - - ControlSearch: { - src: ['control/Control.js', - 'control/Control.Search.js'], - heading: 'Controls', - desc: 'Search control with two buttons (previous / next).' - }, - - ControlInsertImg: { - src: ['control/Control.js', - 'control/Control.InsertImg.js'], - heading: 'Controls', - desc: 'Handles inserting an image in the document.' - }, - - ControlParts: { - src: ['control/Control.js', - 'control/Control.Parts.js'], - heading: 'Controls', - desc: 'Parts control with two buttons (previous / next).' - }, - ControlPartsPreview: { src: ['control/Control.js', 'control/Control.PartsPreview.js'], @@ -329,13 +301,6 @@ var deps = { desc: 'Enables selection in view mode' }, - ControlStatusIndicator: { - src: ['control/Control.js', - 'control/Control.StatusIndicator.js'], - heading: 'Controls', - desc: 'Display document loading status' - }, - ControlScroll: { src: ['control/Control.js', 'control/Control.Scroll.js'], @@ -350,28 +315,6 @@ var deps = { desc: 'Handles vex dialogs for displaying alerts' }, - ControlStyles: { - src: ['control/Control.js', - 'control/Control.Styles.js'], - deps: ['Styles'], - heading: 'Controls', - desc: 'Handles styles selection' - }, - - ControlFonts: { - src: ['control/Control.js', - 'control/Control.Fonts.js'], - heading: 'Controls', - desc: 'Handles fonts selection' - }, - - ControlFormulaBar: { - src: ['control/Control.js', - 'control/Control.Formulabar.js'], - heading: 'Controls', - desc: 'Handles the formula bar in calc' - }, - ControlAttrib: { src: ['control/Control.js', 'control/Control.Attribution.js'], diff --git a/loleaflet/debug/document/document_simple_example.html b/loleaflet/debug/document/document_simple_example.html deleted file mode 100644 index 899897d..0000000 --- a/loleaflet/debug/document/document_simple_example.html +++ /dev/null @@ -1,123 +0,0 @@ -<!DOCTYPE html> -<!-- saved from url=(0054)http://leafletjs.com/examples/quick-start-example.html --> -<html><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> -<title>Document Simple Example</title> -<meta charset="utf-8"> - -<meta name="viewport" content="width=device-width, initial-scale=1.0"> - -<link rel="stylesheet" href="../../dist/leaflet.css"> -<link rel="stylesheet" href="../../dist/selectionMarkers.css"> -<link rel="stylesheet" href="../../dist/loleaflet.css"> -<link rel="stylesheet" href="../../dist/toolbar.css"> -<link rel="stylesheet" href="../../dist/partsPreviewControl.css"> -<link rel="stylesheet" href="../../dist/scrollBar.css"> -<link rel="stylesheet" href="../../dist/searchControl.css"> -<link rel="stylesheet" href="../../dist/spreadsheet.css"> -<link rel="stylesheet" href="../../plugins/draw-0.2.4/dist/leaflet.draw.css"> -<link rel="stylesheet" href="../../dist/scrollbar/jquery.mCustomScrollbar.css"> -<link rel="stylesheet" href="../../dist/contextMenu/jquery.contextMenu.css"> -<link rel="stylesheet" href="../../dist/dialog/vex.css" /> -<link rel="stylesheet" href="../../dist/dialog/vex-theme-plain.css" /> -<link rel="localizations" href="../../dist/l10n/localizations.json" type="application/vnd.oftn.l10n+json" /> -<link rel="localizations" href="../../dist/l10n/styles-localizations.json" type="application/vnd.oftn.l10n+json" /> -<style type="text/css"></style></head> -<body> - <script src="../../dist/leaflet-src.js"></script> - <script src="../../plugins/draw-0.2.4/dist/leaflet.draw.js"></script> - <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.0/jquery.min.js";></script> - <script>window.jQuery || document.write('<script src="../../dist/scrollbar/jquery-1.11.0.min.js"><\/script>')</script> - <script src="../../dist/scrollbar/jquery.mCustomScrollbar.js"></script> - <script src="../../dist/contextMenu/jquery.ui.position.min.js"></script> - <script src="../../dist/contextMenu/jquery.contextMenu.js"></script> - <script src="../../dist/dialog/vex.combined.min.js"></script> - <script src="../../dist/l10n/json2.min.js"></script> - <script src="../../dist/l10n/l10n.min.js"></script> - <script>vex.defaultOptions.className = 'vex-theme-plain';</script> - - <script> var _ = function (string) { return string.toLocaleString();}; </script> - - <!--The "controls" div holds map controls suchs as the Zoom button and - it's separated from the map in order to have the controls on the top - of the page all the time. - - The "document-container" div is the actual display of the document, is - what the user sees and it should be no larger than the screen size. - - The "map" div is the actual document and it has the document's size - and width, this being inside the smaller "document-container" will - cause the content to overflow, creating scrollbars --> - <div id="toolbar"> - </div> - <div id="document-container"> - <!-- Change the background to yellow, to test the transparent tile feature: - <div id="map" style="background-color:yellow;"></div> --> - <div id="map"></div> - </div> - - <script> - - 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 filePath = getParameterByName('file_path'); - var host = getParameterByName('host'); - var token = getParameterByName('token'); - var permission = getParameterByName('permission'); - var timestamp = getParameterByName('timestamp'); - if (wopiSrc === '' && filePath === '') { - vex.dialog.alert('Wrong WOPISrc, usage: WOPISrc=valid encoded URI, or file_path, usage: file_path=/path/to/doc/'); - } - if (host === '') { - vex.dialog.alert('Wrong host, usage: host=wss://localhost:9980'); - } - var docURL = wopiSrc !== '' ? wopiSrc : filePath; - - var renderingOptions = { - ".uno:HideWhitespace": { - "type": "boolean", - "value": "false" - }, - ".uno:ShowBorderShadow": { - "type": "boolean", - "value": "true" - } - }; - - var globalMap = L.map('map', { - doc: docURL, - renderingOptions: renderingOptions, - server: host, - token: token, - //webserver: ..., /* by default derived from 'server' */ - permission: permission, - timestamp: timestamp, - documentContainer: 'document-container', - toolbarContainer: 'toolbar' - }); - - ////// Controls ///// - globalMap.addControl(L.control.styles()); - globalMap.addControl(L.control.fonts()); - globalMap.addControl(L.control.statusIndicator()); - globalMap.addControl(L.control.scroll()); - globalMap.addControl(L.control.formulaBar()); - globalMap.addControl(L.control.zoom()); - globalMap.addControl(L.control.parts()); - globalMap.addControl(L.control.search()); - globalMap.addControl(L.control.insertImg()); - globalMap.addControl(L.control.dialog()); - globalMap.addControl(L.control.partsPreview()); - globalMap.addControl(L.control.tabs()); - globalMap.addControl(L.control.columnHeader()); - globalMap.addControl(L.control.rowHeader()); - - // handle the click on a hyperlink in the document - globalMap.on('hyperlinkclicked', function (e) { window.open(e.url, '_blank'); }); - </script> -</body></html> diff --git a/loleaflet/reference.html b/loleaflet/reference.html index 2da1563..ecc673c 100644 --- a/loleaflet/reference.html +++ b/loleaflet/reference.html @@ -1331,11 +1331,6 @@ var map = L.map('map', { <td>Mobile touch hacks (quick tap and touch hold) handler.</td> </tr> <tr> - <td><code><b>zoomControl</b></code></td> - <td><a href="#control-zoom"><code>Control.Zoom</code></a></td> - <td>Zoom control.</td> - </tr> - <tr> <td><code><b>attributionControl</b></code></td> <td><a href="#control-attribution"><code>Control.Attribution</code></a></td> <td>Attribution control.</td> @@ -5654,69 +5649,6 @@ L.marker([50.505, 30.57], {icon: myIcon}).addTo(map);</code></pre> </tr> </table> -<h2 id="control-zoom">Control.zoom</h2> - -<p>A basic zoom control with two buttons (zoom in and zoom out). It is put on the map by default unless you set its <code>zoomControl</code> option to <code><span class="literal">false</span></code>. Extends <a href="#control">Control</a>.</p> - -<h3>Creation</h3> -<table data-id='control-zoom'> - <tr> - <th>Factory</th> - - <th class="width200">Description</th> - </tr> - <tr> - <td><code><b>L.control.zoom</b>( - <nobr><<a href="#control-zoom-options">Control.Zoom options</a>> <i>options?</i> )</nobr> - </code></td> - - - <td>Creates a zoom control.</td> - </tr> -</table> - -<h3 id="control-zoom-options">Options</h3> -<table data-id='control-zoom'> - <tr> - <th>Option</th> - <th>Type</th> - <th>Default</th> - <th>Description</th> - </tr> - <tr> - <td><code><b>position</b></code></td> - <td><code>String</code></td> - <td><code><span class="string">'topleft'</span></code></td> - <td>The position of the control (one of the map corners). See <a href="#control-positions">control positions</a>.</td> - </tr> - <tr> - <td><code><b>zoomInText</b></code></td> - <td><code>String</code></td> - <td><code><span class="string">'+'</span></code></td> - <td>The text set on the zoom in button.</td> - </tr> - <tr> - <td><code><b>zoomOutText</b></code></td> - <td><code>String</code></td> - <td><code><span class="string">'-'</span></code></td> - <td>The text set on the zoom out button.</td> - </tr> - <tr> - <td><code><b>zoomInTitle</b></code></td> - <td><code>String</code></td> - <td><code><span class="string">'Zoom in'</span></code></td> - <td>The title set on the zoom in button.</td> - </tr> - <tr> - <td><code><b>zoomOutTitle</b></code></td> - <td><code>String</code></td> - <td><code><span class="string">'Zoom out'</span></code></td> - <td>The title set on the zoom out button.</td> - </tr> -</table> - - - <h2 id="control-attribution">Control.Attribution</h2> <p>The attribution control allows you to display attribution data in a small text box on a map. It is put on the map by default unless you set its <code>attributionControl</code> option to <code><span class="literal">false</span></code>, and it fetches attribution texts from layers with <code>getAttribution</code> method automatically. Extends <a href="#control">Control</a>.</p> diff --git a/loleaflet/src/control/Control.Fonts.js b/loleaflet/src/control/Control.Fonts.js deleted file mode 100644 index 390b715..0000000 --- a/loleaflet/src/control/Control.Fonts.js +++ /dev/null @@ -1,147 +0,0 @@ -/* - * L.Control.Fonts is used to display a dropdown list of fonts - */ - -L.Control.Fonts = L.Control.extend({ - options: { - fontsInfo: '- Fonts -', - sizesInfo: '- Sizes -' - }, - - onAdd: function (map) { - var fontsName = 'leaflet-control-fonts'; - var sizesName = 'leaflet-control-sizes'; - this._container = L.DomUtil.create('div', 'leaflet-control-fonts-container'); - this._fontSelect = L.DomUtil.create('select', fontsName + ' leaflet-bar', this._container); - this._sizeSelect = L.DomUtil.create('select', sizesName + ' leaflet-bar', this._container); - - map.on('updatepermission', this._onUpdatePermission, this); - map.on('updatetoolbarcommandvalues', this._initList, this); - map.on('commandstatechanged', this._onStateChange, this); - L.DomEvent.on(this._fontSelect, 'change', this._onChangeFont, this); - L.DomEvent.on(this._sizeSelect, 'change', this._onChangeSize, this); - - return this._container; - }, - - onRemove: function (map) { - map.off('updatepermission', this._searchResultFound, this); - }, - - _initList: function (e) { - if (e.commandName === '.uno:CharFontName') { - this._commandValues = e.commandValues; - var container = this._fontSelect; - var first = L.DomUtil.create('option', '', container); - first.innerHTML = this.options.fontsInfo; - var fonts = e.commandValues; - if (!fonts) { - // in case of empty string, make sure `fonts' is not iterated - fonts = []; - } - for (var font in fonts) { - var item = L.DomUtil.create('option', '', container); - item.value = font; - item.innerHTML = font; - } - - // Don't show any font sizes yet - first = L.DomUtil.create('option', '', this._sizeSelect); - first.innerHTML = this.options.sizesInfo; - } - }, - - _onUpdatePermission: function (e) { - if (e.perm === 'edit') { - this._fontSelect.disabled = false; - this._sizeSelect.disabled = false; - } - else { - this._fontSelect.disabled = true; - this._sizeSelect.disabled = true; - } - }, - - _onChangeFont: function (e) { - var font = e.target.value; - if (font === this.options.fontsInfo) { - return; - } - this._updateSizeList(font); - this._map.applyFont(font); - this._refocusOnMap(); - }, - - _onChangeSize: function (e) { - var size = e.target.value; - if (size === this.options.sizesInfo) { - return; - } - this._map.applyFontSize(size); - this._refocusOnMap(); - }, - - _updateSizeList: function (font) { - var container = this._sizeSelect; - var oldSize = this._sizeSelect.value; - for (var i = container.options.length - 1; i >= 0; i--) { - container.remove(i); - } - var first = L.DomUtil.create('option', '', container); - first.innerHTML = this.options.sizesInfo; - var sizes = this._commandValues[font]; - sizes.forEach(function (size) { - var item = L.DomUtil.create('option', '', container); - item.value = size; - item.innerHTML = size; - }); - this._setFontSize(oldSize); - }, - - _setFontSize: function (fontSize) { - for (var i = 0; i < this._sizeSelect.length; i++) { - var value = this._sizeSelect[i].value; - if (value === fontSize) { - this._sizeSelect.value = fontSize; - return; - } - } - // we have a new font size, like 18.2 - var item = L.DomUtil.create('option', '', this._sizeSelect); - item.value = fontSize; - item.innerHTML = fontSize; - this._sizeSelect.value = fontSize; - }, - - _onStateChange: function (e) { - if (!e.state) { - return; - } - - if (e.commandName === '.uno:CharFontName') { - for (var i = 0; i < this._fontSelect.length; i++) { - var value = this._fontSelect[i].value; - if (value && value.toLowerCase() === e.state.toLowerCase()) { - this._fontSelect.value = value; - this._updateSizeList(value); - return; - } - } - // we have a new font name - var item = L.DomUtil.create('option', '', this._fontSelect); - item.value = e.state; - item.innerHTML = e.state; - this._fontSelect.value = e.state; - } - else if (e.commandName === '.uno:FontHeight') { - if (e.state === '0') { - e.state = ''; - } - this._setFontSize(e.state); - } - } -}); - -L.control.fonts = function (options) { - return new L.Control.Fonts(options); -}; diff --git a/loleaflet/src/control/Control.Formulabar.js b/loleaflet/src/control/Control.Formulabar.js deleted file mode 100644 index 0a6c352..0000000 --- a/loleaflet/src/control/Control.Formulabar.js +++ /dev/null @@ -1,28 +0,0 @@ -/* - * L.Control.FormulaBar - */ - -L.Control.FormulaBar = L.Control.extend({ - onAdd: function (map) { - this._formulaBar = L.DomUtil.create('input', 'leaflet-control-formulabar leaflet-bar'); - this._formulaBar.type = 'text'; - L.DomEvent.on(this._formulaBar, 'keyup', this._onInput, this); - map.on('cellformula', this._onFormulaChange, this); - return this._formulaBar; - }, - - _onInput: function () { - this._map.cellEnterString(this._formulaBar.value); - }, - - _onFormulaChange: function (e) { - if (document.activeElement !== this._formulaBar) { - // if the user is not writing - this._formulaBar.value = e.formula; - } - } -}); - -L.control.formulaBar = function (options) { - return new L.Control.FormulaBar(options); -}; diff --git a/loleaflet/src/control/Control.InsertImg.js b/loleaflet/src/control/Control.InsertImg.js deleted file mode 100644 index 07c26ee..0000000 --- a/loleaflet/src/control/Control.InsertImg.js +++ /dev/null @@ -1,25 +0,0 @@ -/* - * L.Control.InsertImg - */ - -L.Control.InsertImg = L.Control.extend({ - onAdd: function () { - this._insertImg = L.DomUtil.create('input', 'leaflet-control-insertimage leaflet-bar'); - this._insertImg.type = 'file'; - L.DomEvent.on(this._insertImg, 'change', this._onChange, this); - return this._insertImg; - }, - - _onChange: function () { - if ('files' in this._insertImg) { - for (var i = 0; i < this._insertImg.files.length; i++) { - var file = this._insertImg.files[i]; - this._map.insertFile(file); - } - } - } -}); - -L.control.insertImg = function (options) { - return new L.Control.InsertImg(options); -}; diff --git a/loleaflet/src/control/Control.Parts.js b/loleaflet/src/control/Control.Parts.js deleted file mode 100644 index 4a24e78..0000000 --- a/loleaflet/src/control/Control.Parts.js +++ /dev/null @@ -1,104 +0,0 @@ -/* - * L.Control.Parts is used to switch parts - */ - -L.Control.Parts = L.Control.extend({ - options: { - position: 'topleft', - prevPartText: '▲', - prevPartTitle: 'Previous part', - nextPartText: '▼', - nextPartTitle: 'Next part' - }, - - onAdd: function (map) { - var partName = 'leaflet-control-part', - container = L.DomUtil.create('div', partName + ' leaflet-bar'), - options = this.options; - - this._prevPartButton = this._createButton(options.prevPartText, options.prevPartTitle, - partName + '-prev', container, this._prevPart); - this._nextPartButton = this._createButton(options.nextPartText, options.nextPartTitle, - partName + '-next', container, this._nextPart); - - map.on('updateparts', this._updateDisabled, this); - map.on('pagenumberchanged', this._updateDisabledText, this); - return container; - }, - - _prevPart: function () { - if (this._docType === 'text' && this._currentPage > 0) { - this._map.goToPage(this._currentPage - 1); - } - else { - this._map.setPart('prev'); - } - }, - - _nextPart: function () { - if (this._docType === 'text' && this._currentPage < this._pages - 1) { - this._map.goToPage(this._currentPage + 1); - } - else { - this._map.setPart('next'); - } - }, - - _createButton: function (html, title, className, container, fn) { - var link = L.DomUtil.create('a', className, container); - link.innerHTML = html; - link.href = '#'; - link.title = title; - - L.DomEvent - .on(link, 'mousedown dblclick', L.DomEvent.stopPropagation) - .on(link, 'click', L.DomEvent.stop) - .on(link, 'click', fn, this) - .on(link, 'click', this._refocusOnMap, this); - - return link; - }, - - _updateDisabled: function (e) { - var className = 'leaflet-disabled'; - var parts = e.parts; - var selectedPart = e.selectedPart; - var docType = e.docType; - if (docType === 'text') { - return; - } - if (selectedPart === 0) { - L.DomUtil.addClass(this._prevPartButton, className); - } else { - L.DomUtil.removeClass(this._prevPartButton, className); - } - if (selectedPart === parts - 1) { - L.DomUtil.addClass(this._nextPartButton, className); - } else { - L.DomUtil.removeClass(this._nextPartButton, className); - } - }, - - _updateDisabledText: function (e) { - if (e) { - this._currentPage = e.currentPage; - this._pages = e.pages; - this._docType = e.docType; - } - var className = 'leaflet-disabled'; - if (this._currentPage === 0) { - L.DomUtil.addClass(this._prevPartButton, className); - } else { - L.DomUtil.removeClass(this._prevPartButton, className); - } - if (this._currentPage === this._pages - 1) { - L.DomUtil.addClass(this._nextPartButton, className); - } else { - L.DomUtil.removeClass(this._nextPartButton, className); - } - } -}); - -L.control.parts = function (options) { - return new L.Control.Parts(options); -}; diff --git a/loleaflet/src/control/Control.Search.js b/loleaflet/src/control/Control.Search.js deleted file mode 100644 index ff312bb..0000000 --- a/loleaflet/src/control/Control.Search.js +++ /dev/null @@ -1,135 +0,0 @@ -/* - * L.Control.Search is used for searching text in the document - */ - -L.Control.Search = L.Control.extend({ - options: { - position: 'topleft', - searchTitle: 'Search document', - prevText: '▲', - prevTitle: 'Previous', - nextText: '▼', - nextTitle: 'Next', - highlightText: '☼', - highlightTitle: 'Highlight all', - cancelText: '✖', - cancelTitle: 'Cancel' - }, - - onAdd: function (map) { - var searchName = 'leaflet-control-search', - container = L.DomUtil.create('div', searchName + ' leaflet-bar'), - options = this.options; - - this._searchBar = this._createSearchBar(options.searchTitle, - searchName + '-bar', container, this._searchStart); - this._prevButton = this._createButton(options.prevText, options.prevTitle, - searchName + '-prev', container, this._searchPrev); - this._nextButton = this._createButton(options.nextText, options.nextTitle, - searchName + '-next', container, this._searchNext); - this._highlightButton = this._createButton(options.highlightText, options.highlightTitle, - searchName + '-highlight', container, this._highlightAll); - this._cancelButton = this._createButton(options.cancelText, options.cancelTitle, - searchName + '-cancel', container, this._cancel); - - this._disabled = true; - this._updateDisabled(); - map.on('clearnotfound search', this._searchResultFound, this); - - return container; - }, - - onRemove: function (map) { - map.on('clearnotfound search', this._searchResultFound, this); - }, - - _searchStart: function (e) { - if (e.keyCode === 13) { - this._map.search(this._searchBar.value); - this._disabled = false; - this._updateDisabled(); - this._refocusOnMap(); - } - else { - this._map._socket.sendMessage('requestloksession'); - } - }, - - _searchResultFound: function (e) { - if (e.type === 'clearnotfound') { - L.DomUtil.removeClass(this._searchBar, 'search-not-found'); - } - else if (e.type === 'search' && e.count === 0) { - L.DomUtil.addClass(this._searchBar, 'search-not-found'); - setTimeout(L.bind(this._map.fire, this._map, 'clearnotfound'), 500); - } - }, - - _searchPrev: function () { - this._map.search(this._searchBar.value, true); - this._refocusOnMap(); - }, - - _searchNext: function () { - this._map.search(this._searchBar.value); - this._refocusOnMap(); - }, - - _highlightAll: function () { - this._map.highlightAll(this._searchBar.value); - this._refocusOnMap(); - }, - - _cancel: function () { - L.DomUtil.setStyle(this._cancelButton, 'display', 'none'); - this._map.fire('clearselection'); - this._disabled = true; - this._updateDisabled(); - this._refocusOnMap(); - }, - - _createSearchBar: function(title, className, container, fn) { - var bar = L.DomUtil.create('input', className, container); - bar.type = 'text'; - bar.title = title; - bar.placeholder = 'Search'; - - L.DomEvent - .on(bar, 'click', L.DomEvent.stop) - .on(bar, 'click', fn, this) - .on(bar, 'keyup', L.DomEvent.stop) - .on(bar, 'keyup', fn, this); - - return bar; - }, - - _createButton: function (text, title, className, container, fn) { - // TODO create it as it is done for zoom, css knowledge required - var button = L.DomUtil.create('button', className, container); - button.innerHTML = text; - button.title = title; - - L.DomEvent - .on(button, 'mousedown dblclick', L.DomEvent.stopPropagation) - .on(button, 'click', L.DomEvent.stop) - .on(button, 'click', fn, this) - .on(button, 'click', this._refocusOnMap, this); - - return button; - }, - - _updateDisabled: function () { - this._prevButton.disabled = this._disabled; - this._nextButton.disabled = this._disabled; - if (this._disabled) { - L.DomUtil.setStyle(this._cancelButton, 'display', 'none'); - } - else { - L.DomUtil.setStyle(this._cancelButton, 'display', 'inline-block'); - } - } -}); - -L.control.search = function (options) { - return new L.Control.Search(options); -}; diff --git a/loleaflet/src/control/Control.StatusIndicator.js b/loleaflet/src/control/Control.StatusIndicator.js deleted file mode 100644 index 4603ff9..0000000 --- a/loleaflet/src/control/Control.StatusIndicator.js +++ /dev/null @@ -1,34 +0,0 @@ -/* - * L.Control.StatusIndicator is used for displaying the current loading status - */ - -L.Control.StatusIndicator = L.Control.extend({ - options: { - position: 'topleft' - }, - - onAdd: function (map) { - var partName = 'leaflet-control-statusindicator'; - this._container = L.DomUtil.create('div', partName + ' leaflet-bar'); - - map.on('statusindicator', this._updateStatus, this); - return this._container; - }, - - _updateStatus: function (e) { - if (e.statusType === 'start') { - L.DomUtil.setStyle(this._container, 'display', ''); - this._container.innerText = '0 %'; - } - else if (e.statusType === 'setvalue') { - this._container.innerText = e.value + '% '; - } - else if (e.statusType === 'finish') { - L.DomUtil.setStyle(this._container, 'display', 'none'); - } - } -}); - -L.control.statusIndicator = function (options) { - return new L.Control.StatusIndicator(options); -}; diff --git a/loleaflet/src/control/Control.Styles.js b/loleaflet/src/control/Control.Styles.js deleted file mode 100644 index 7ce6fca..0000000 --- a/loleaflet/src/control/Control.Styles.js +++ /dev/null @@ -1,149 +0,0 @@ -/* - * L.Control.Styles is used to display a dropdown list of styles - */ - -L.Control.Styles = L.Control.extend({ - options: { - info: '- Styles -' - }, - - onAdd: function (map) { - var stylesName = 'leaflet-control-styles'; - this._container = L.DomUtil.create('select', stylesName + ' leaflet-bar'); - - map.on('updatepermission', this._onUpdatePermission, this); - map.on('updatetoolbarcommandvalues', this._initList, this); - map.on('commandstatechanged', this._onStateChange, this); - L.DomEvent.on(this._container, 'change', this._onChange, this); - - return this._container; - }, - - onRemove: function (map) { - map.off('updatepermission', this._searchResultFound, this); - }, - - _addSeparator: function () { - var item = L.DomUtil.create('option', '', this._container); - item.disabled = true; - item.value = 'separator'; - item.innerHTML = '────────────'; - }, - - _initList: function (e) { - if (e.commandName === '.uno:StyleApply') { - var container = this._container; - var first = L.DomUtil.create('option', '', container); - first.innerHTML = this.options.info; - - var styles = []; - var topStyles = []; - if (this._map.getDocType() === 'text') { - // The list contains a total of 100+ styles, the first 7 are - // the default styles (as shown on desktop writer), we then - // also show a selection of 12 more styles. - styles = e.commandValues.ParagraphStyles.slice(7, 19); - topStyles = e.commandValues.ParagraphStyles.slice(0, 7); - } - else if (this._map.getDocType() === 'presentation' || - this._map.getDocType() === 'drawing') { - styles = e.commandValues.Default; - } - else if (this._map.getDocType() === 'spreadsheet') { - styles = e.commandValues.CellStyles; - } - - var commands = e.commandValues.Commands; - if (commands && commands.length > 0) { - this._addSeparator(); - - commands.forEach(function (command) { - var item = L.DomUtil.create('option', '', container); - item.value = command.id; - item.innerHTML = L.Styles.styleMappings[command.text].toLocaleString(); - }, this); - } - - if (topStyles.length > 0) { - this._addSeparator(); - topStyles.forEach(function (style) { - var item = L.DomUtil.create('option', '', container); - item.value = style; - item.innerHTML = L.Styles.styleMappings[style].toLocaleString(); - }, this); - } - - if (styles.length > 0) { - this._addSeparator(); - styles.forEach(function (style) { - var item = L.DomUtil.create('option', '', container); - item.value = style; - var localeStyle; - if (style.startsWith('outline')) { - var outlineLevel = style.split('outline')[1]; - localeStyle = 'Outline'.toLocaleString() + ' ' + outlineLevel; - } else { - localeStyle = L.Styles.styleMappings[style].toLocaleString(); - } - - item.innerHTML = localeStyle; - }, this); - } - } - }, - - _onUpdatePermission: function (e) { - if (e.perm === 'edit') { - this._container.disabled = false; - } - else { - this._container.disabled = true; - } - }, - - _onChange: function (e) { - var style = e.target.value; - if (style === this.options.info) { - return; - } - if (style.startsWith('.uno:')) { - this._map.sendUnoCommand(style); - } - else if (this._map.getDocType() === 'text') { - this._map.applyStyle(style, 'ParagraphStyles'); - } - else if (this._map.getDocType() === 'presentation') { - this._map.applyStyle(style, 'Default'); - } - this._refocusOnMap(); - }, - - _onStateChange: function (e) { - if (!e.state) { - return; - } - - // For impress documents, template name is prefixed with style name. - // Strip the template name until we support it - if (this._map.getDocType() === 'presentation') { - e.state = e.state.split('~LT~')[1]; - e.state = L.Styles.impressMapping[e.state]; - } - if (e.commandName === '.uno:StyleApply') { - for (var i = 0; i < this._container.length; i++) { - var value = this._container[i].value; - // For writer we get UI names; ideally we should be getting only programmatic ones - // For eg: 'Text body' vs 'Text Body' - // (likely to be fixed in core to make the pattern consistent) - if (value.toLowerCase() === e.state.toLowerCase()) { - this._container.value = value; - return; - } - } - } - } -}); - -L.control.styles = function (options) { - return new L.Control.Styles(options); -}; diff --git a/loleaflet/src/control/Control.Zoom.js b/loleaflet/src/control/Control.Zoom.js deleted file mode 100644 index 837dfaa..0000000 --- a/loleaflet/src/control/Control.Zoom.js +++ /dev/null @@ -1,102 +0,0 @@ -/* - * L.Control.Zoom is used for the default zoom buttons on the map. - */ - -L.Control.Zoom = L.Control.extend({ - options: { - position: 'topleft', - zoomInText: '+', - zoomInTitle: 'Zoom in', - fitWidthText: 'â', - fitWidthTitle: 'Fit Width', - zoomOutText: '-', - zoomOutTitle: 'Zoom out' - }, - - onAdd: function (map) { - var zoomName = 'leaflet-control-zoom', - container = L.DomUtil.create('div', zoomName + ' leaflet-bar'), - options = this.options; - - this._zoomInButton = this._createButton(options.zoomInText, options.zoomInTitle, - zoomName + '-in', container, this._zoomIn); - this._fitWidthButton = this._createButton(options.fitWidthText, options.fitWidthTitle, - zoomName + '-fitwidth', container, this._fitWidth); - this._zoomOutButton = this._createButton(options.zoomOutText, options.zoomOutTitle, - zoomName + '-out', container, this._zoomOut); - - this._updateDisabled(); - map.on('zoomlevelschange', this._updateDisabled, this); - - return container; - }, - - onRemove: function (map) { - map.off('zoomlevelschange', this._updateDisabled, this); - }, - - disable: function () { - this._disabled = true; - this._updateDisabled(); - return this; - }, - - enable: function () { - this._disabled = false; - this._updateDisabled(); - return this; - }, - - _zoomIn: function (e) { - if (!this._disabled) { - this._map.zoomIn(e.shiftKey ? 3 : 1); - } - }, - - _fitWidth: function () { - if (!this._disabled) { - this._map.fitWidthZoom(); - } - }, - - _zoomOut: function (e) { - if (!this._disabled) { - this._map.zoomOut(e.shiftKey ? 3 : 1); - } - }, - - _createButton: function (html, title, className, container, fn) { - var link = L.DomUtil.create('a', className, container); - link.innerHTML = html; - link.href = '#'; - link.title = title; - - L.DomEvent - .on(link, 'mousedown dblclick', L.DomEvent.stopPropagation) - .on(link, 'click', L.DomEvent.stop) - .on(link, 'click', fn, this) - .on(link, 'click', this._refocusOnMap, this); - - return link; - }, - - _updateDisabled: function () { - var map = this._map, - className = 'leaflet-disabled'; - - L.DomUtil.removeClass(this._zoomInButton, className); - L.DomUtil.removeClass(this._fitWidthButton, className); - L.DomUtil.removeClass(this._zoomOutButton, className); - - if (this._disabled || map._zoom === map.getMinZoom()) { - L.DomUtil.addClass(this._zoomOutButton, className); - } - if (this._disabled || map._zoom === map.getMaxZoom()) { - L.DomUtil.addClass(this._zoomInButton, className); - } - } -}); - -L.control.zoom = function (options) { - return new L.Control.Zoom(options); -}; commit 1e57be70943128227b7696f5cfb05e3dcea291f4 Author: Jan Holesovsky <[email protected]> Date: Wed May 18 09:44:35 2016 +0200 Fix some broken icons, remove the unused ones. diff --git a/loleaflet/dist/images/edit.png b/loleaflet/dist/images/edit.png deleted file mode 100644 index d0dfaa5..0000000 Binary files a/loleaflet/dist/images/edit.png and /dev/null differ diff --git a/loleaflet/dist/images/layers-2x.png b/loleaflet/dist/images/layers-2x.png index de54f88..a2cf7f9 100644 Binary files a/loleaflet/dist/images/layers-2x.png and b/loleaflet/dist/images/layers-2x.png differ diff --git a/loleaflet/dist/images/layers.png b/loleaflet/dist/images/layers.png index 89869fd..bca0a0e 100644 Binary files a/loleaflet/dist/images/layers.png and b/loleaflet/dist/images/layers.png differ diff --git a/loleaflet/dist/images/marker-icon-2x.png b/loleaflet/dist/images/marker-icon-2x.png index e7159bb..0015b64 100644 Binary files a/loleaflet/dist/images/marker-icon-2x.png and b/loleaflet/dist/images/marker-icon-2x.png differ diff --git a/loleaflet/dist/images/marker-icon.png b/loleaflet/dist/images/marker-icon.png index 565dfa1..e2e9f75 100644 Binary files a/loleaflet/dist/images/marker-icon.png and b/loleaflet/dist/images/marker-icon.png differ diff --git a/loleaflet/dist/images/selection.png b/loleaflet/dist/images/selection.png deleted file mode 100644 index f9121b9..0000000 Binary files a/loleaflet/dist/images/selection.png and /dev/null differ commit 30f34cff39c6fdd50f8400b4884b637df6ff7ba2 Author: Jan Holesovsky <[email protected]> Date: Wed May 18 09:35:48 2016 +0200 document_simple_example: Kill Control.Presentation.js. diff --git a/loleaflet/Makefile b/loleaflet/Makefile index 4e752f5..99d685d 100644 --- a/loleaflet/Makefile +++ b/loleaflet/Makefile @@ -29,7 +29,7 @@ dist: all pot: xgettext --keyword=_ --output=po/loleaflet-ui.pot dist/toolbar/toolbar.js src/control/Control.Tabs.js \ - src/core/Socket.js src/control/Control.Presentation.js + src/core/Socket.js html2po --pot --input=dist/loleaflet-help.html --output=po/loleaflet-help.pot l10n: pot diff --git a/loleaflet/build/deps.js b/loleaflet/build/deps.js index 7e316bb..347721d 100644 --- a/loleaflet/build/deps.js +++ b/loleaflet/build/deps.js @@ -287,13 +287,6 @@ var deps = { desc: 'Parts preview sidebar' }, - ControlPresentation: { - src: ['control/Control.js', - 'control/Control.Presentation.js'], - heading: 'Controls', - desc: 'Common commands for slides.' - }, - ControlColumnHeader: { src: ['control/Control.js', 'control/Control.ColumnHeader.js'], diff --git a/loleaflet/debug/document/document_simple_example.html b/loleaflet/debug/document/document_simple_example.html index 6d9cfc6..899897d 100644 --- a/loleaflet/debug/document/document_simple_example.html +++ b/loleaflet/debug/document/document_simple_example.html @@ -116,7 +116,6 @@ globalMap.addControl(L.control.tabs()); globalMap.addControl(L.control.columnHeader()); globalMap.addControl(L.control.rowHeader()); - globalMap.addControl(L.control.presentation()); // handle the click on a hyperlink in the document globalMap.on('hyperlinkclicked', function (e) { window.open(e.url, '_blank'); }); diff --git a/loleaflet/dist/images/deletepage.png b/loleaflet/dist/images/deletepage.png deleted file mode 100644 index e12688a..0000000 Binary files a/loleaflet/dist/images/deletepage.png and /dev/null differ diff --git a/loleaflet/dist/images/duplicatepage.png b/loleaflet/dist/images/duplicatepage.png deleted file mode 100644 index 234a362..0000000 Binary files a/loleaflet/dist/images/duplicatepage.png and /dev/null differ diff --git a/loleaflet/dist/images/insertpage.png b/loleaflet/dist/images/insertpage.png deleted file mode 100644 index 612251d..0000000 Binary files a/loleaflet/dist/images/insertpage.png and /dev/null differ diff --git a/loleaflet/src/control/Control.Presentation.js b/loleaflet/src/control/Control.Presentation.js deleted file mode 100644 index e75cdad..0000000 --- a/loleaflet/src/control/Control.Presentation.js +++ /dev/null @@ -1,109 +0,0 @@ -/* - * L.Control.Presentation is used for common commands for slides. - */ - -/* global vex _ */ -L.Control.Presentation = L.Control.extend({ - options: { - position: 'topleft' - }, - - onAdd: function (map) { - var buttonsName = 'leaflet-control-presentation', - container = L.DomUtil.create('div', buttonsName + '-container' + ' leaflet-bar'); - - this._buttons = { - 'insertpage': {title: _('Insert Page'), uno: 'InsertPage', iconName: 'insertpage.png'}, - 'duplicatepage': {title: _('Duplicate Page'), uno: 'DuplicatePage', iconName: 'duplicatepage.png'}, - 'deletepage': {title: _('Delete Page'), uno: 'DeletePage', iconName: 'deletepage.png'} - }; - - for (var key in this._buttons) { - var button = this._buttons[key]; - button.el = this._createButton(key, button.title, button.iconName, - buttonsName, container, this._onButtonClick); - } - - map.on('commandstatechanged', this._onStateChange, this); - map.on('updatepermission', this._onPermissionUpdate, this); - - return container; - }, - - _onPermissionUpdate: function (e) { - for (var id in this._buttons) { - var button = this._buttons[id]; - if (button.uno) { - if (e.perm !== 'edit' || this._map.getDocType() !== 'presentation') { - L.DomUtil.addClass(button.el.firstChild, 'leaflet-control-buttons-disabled'); - } - else { - L.DomUtil.removeClass(button.el.firstChild, 'leaflet-control-buttons-disabled'); - } - } - } - }, - - _createButton: function (id, title, iconName, className, container, fn) { - var link = L.DomUtil.create('a', className, container); - link.href = '#'; - link.title = title; - var img = L.DomUtil.create('img', className, link); - img.id = id; - img.src = L.Icon.Default.imagePath + '/' + iconName; - - L.DomEvent - .on(link, 'mousedown dblclick', L.DomEvent.stopPropagation) - .on(link, 'click', L.DomEvent.stop) - .on(link, 'click', fn, this) - .on(link, 'click', this._refocusOnMap, this); - - return link; - }, - - _onButtonClick: function (e) { - if (L.DomUtil.hasClass(e.target.parentNode, 'leaflet-disabled')) { - return; - } - var id = e.target.id; - - if (id === 'insertpage') { - this._map.insertPage(); - } - else if (id === 'duplicatepage') { - this._map.duplicatePage(); - } - else if (id === 'deletepage') { - vex.dialog.confirm({ - message: _('Are you sure you want to delete this page?'), - callback: L.bind(this._onDelete, this) - }); - } - }, - - _onStateChange: function (e) { - var commandName = e.commandName; - var enabled = e.state; - for (var key in this._buttons) { - var button = this._buttons[key]; - if ('.uno:' + button.uno === commandName) { - if (enabled === 'true' && this._map._permission === 'edit') { - L.DomUtil.removeClass(button.el.firstChild, 'leaflet-control-buttons-disabled'); - } - else if (enabled === 'false') { - L.DomUtil.addClass(button.el.firstChild, 'leaflet-control-buttons-disabled'); - } - } - } - }, - - _onDelete: function (e) { - if (e !== false) { - this._map.deletePage(); - } - } -}); - -L.control.presentation = function (options) { - return new L.Control.Presentation(options); -}; commit 0f3cf72724a8874b834f65fa1f5affbf9094840b Author: Jan Holesovsky <[email protected]> Date: Wed May 18 09:27:47 2016 +0200 document_simple_example: Kill Control.Buttons.js. We don't need the document_simple_example.html any more, remove the stuff that is needed only for that. diff --git a/loleaflet/build/deps.js b/loleaflet/build/deps.js index f7cc95b..7e316bb 100644 --- a/loleaflet/build/deps.js +++ b/loleaflet/build/deps.js @@ -336,13 +336,6 @@ var deps = { desc: 'Enables selection in view mode' }, - ControlButtons: { - src: ['control/Control.js', - 'control/Control.Buttons.js'], - heading: 'Buttons', - desc: 'Handles buttons from the toolbar' - }, - ControlStatusIndicator: { src: ['control/Control.js', 'control/Control.StatusIndicator.js'], diff --git a/loleaflet/debug/document/document_simple_example.html b/loleaflet/debug/document/document_simple_example.html index 78cb3c6..6d9cfc6 100644 --- a/loleaflet/debug/document/document_simple_example.html +++ b/loleaflet/debug/document/document_simple_example.html @@ -104,7 +104,6 @@ ////// Controls ///// globalMap.addControl(L.control.styles()); globalMap.addControl(L.control.fonts()); - globalMap.addControl(L.control.buttons()); globalMap.addControl(L.control.statusIndicator()); globalMap.addControl(L.control.scroll()); globalMap.addControl(L.control.formulaBar()); diff --git a/loleaflet/dist/images/alignblock.png b/loleaflet/dist/images/alignblock.png deleted file mode 100644 index 0c647ec..0000000 Binary files a/loleaflet/dist/images/alignblock.png and /dev/null differ diff --git a/loleaflet/dist/images/aligncenter.png b/loleaflet/dist/images/aligncenter.png deleted file mode 100644 index 1326ae0..0000000 Binary files a/loleaflet/dist/images/aligncenter.png and /dev/null differ diff --git a/loleaflet/dist/images/alignleft.png b/loleaflet/dist/images/alignleft.png deleted file mode 100644 index a037e60..0000000 Binary files a/loleaflet/dist/images/alignleft.png and /dev/null differ diff --git a/loleaflet/dist/images/alignright.png b/loleaflet/dist/images/alignright.png deleted file mode 100644 index 9ec2747..0000000 Binary files a/loleaflet/dist/images/alignright.png and /dev/null differ diff --git a/loleaflet/dist/images/bold.png b/loleaflet/dist/images/bold.png deleted file mode 100644 index f3ff0c5..0000000 Binary files a/loleaflet/dist/images/bold.png and /dev/null differ diff --git a/loleaflet/dist/images/decrementindent.png b/loleaflet/dist/images/decrementindent.png deleted file mode 100644 index b2a6c72..0000000 Binary files a/loleaflet/dist/images/decrementindent.png and /dev/null differ diff --git a/loleaflet/dist/images/defaultbullet.png b/loleaflet/dist/images/defaultbullet.png deleted file mode 100644 index 6dfcdac..0000000 Binary files a/loleaflet/dist/images/defaultbullet.png and /dev/null differ diff --git a/loleaflet/dist/images/defaultnumbering.png b/loleaflet/dist/images/defaultnumbering.png deleted file mode 100644 index 7715687..0000000 Binary files a/loleaflet/dist/images/defaultnumbering.png and /dev/null differ diff --git a/loleaflet/dist/images/incrementindent.png b/loleaflet/dist/images/incrementindent.png deleted file mode 100644 index a1d6125..0000000 Binary files a/loleaflet/dist/images/incrementindent.png and /dev/null differ diff --git a/loleaflet/dist/images/italic.png b/loleaflet/dist/images/italic.png deleted file mode 100644 index 56a9510..0000000 Binary files a/loleaflet/dist/images/italic.png and /dev/null differ diff --git a/loleaflet/dist/images/presentation.png b/loleaflet/dist/images/presentation.png deleted file mode 100644 index 49f1ada..0000000 Binary files a/loleaflet/dist/images/presentation.png and /dev/null differ diff --git a/loleaflet/dist/images/redo.png b/loleaflet/dist/images/redo.png deleted file mode 100644 index 6cfdb00..0000000 Binary files a/loleaflet/dist/images/redo.png and /dev/null differ diff --git a/loleaflet/dist/images/save.png b/loleaflet/dist/images/save.png deleted file mode 100644 index 325b074..0000000 Binary files a/loleaflet/dist/images/save.png and /dev/null differ diff --git a/loleaflet/dist/images/saveas.png b/loleaflet/dist/images/saveas.png deleted file mode 100644 index 03d78c9..0000000 Binary files a/loleaflet/dist/images/saveas.png and /dev/null differ diff --git a/loleaflet/dist/images/strikethrough.png b/loleaflet/dist/images/strikethrough.png deleted file mode 100644 index 809a2b9..0000000 Binary files a/loleaflet/dist/images/strikethrough.png and /dev/null differ diff --git a/loleaflet/dist/images/underline.png b/loleaflet/dist/images/underline.png deleted file mode 100644 index e5ce026..0000000 Binary files a/loleaflet/dist/images/underline.png and /dev/null differ diff --git a/loleaflet/dist/images/undo.png b/loleaflet/dist/images/undo.png deleted file mode 100644 index 8a12204..0000000 Binary files a/loleaflet/dist/images/undo.png and /dev/null differ diff --git a/loleaflet/src/control/Control.Buttons.js b/loleaflet/src/control/Control.Buttons.js deleted file mode 100644 index d2a9c76..0000000 --- a/loleaflet/src/control/Control.Buttons.js +++ /dev/null @@ -1,171 +0,0 @@ -/* - * L.Control.Buttons handles buttons such as bold, italic, etc. - */ - -/* global vex */ -L.Control.Buttons = L.Control.extend({ - options: { - position: 'topleft' - }, - - onAdd: function (map) { - var buttonsName = 'leaflet-control-buttons', - container = L.DomUtil.create('div', buttonsName + '-container' + ' leaflet-bar'); - - var sheetAlign = 'HorizontalAlignment {"HorizontalAlignment":{"type":"unsigned short", "value":"'; - - this._buttons = { - 'bold': {title: 'Bold', uno: 'Bold', iconName: 'bold.png'}, - 'italic': {title: 'Italic', uno: 'Italic', iconName: 'italic.png'}, - 'underline': {title: 'Underline', uno: 'Underline', iconName: 'underline.png'}, - 'strikethrough': {title: 'Strike-through', uno: 'Strikeout', iconName: 'strikethrough.png'}, - 'bullet' : {title: 'Bullets ON/OFF', uno: 'DefaultBullet', iconName: 'defaultbullet.png'}, - 'numbering' : {title: 'Numbering ON/OFF', uno: 'DefaultNumbering', iconName: 'defaultnumbering.png'}, - 'alignleft': {title: 'Align left', uno: 'LeftPara', unosheet: sheetAlign + '1"}}', iconName: 'alignleft.png'}, - 'aligncenter': {title: 'Center horizontaly', uno: 'CenterPara', unosheet: sheetAlign + '2"}}', iconName: 'aligncenter.png'}, - 'alignright': {title: 'Align right', uno: 'RightPara', unosheet: sheetAlign + '3"}}', iconName: 'alignright.png'}, - 'alignblock': {title: 'Justified', uno: 'JustifyPara', unosheet: sheetAlign + '4"}}', iconName: 'alignblock.png'}, - 'incindent': {title: 'Increment indent', uno: 'IncrementIndent', iconName: 'incrementindent.png'}, - 'decindent': {title: 'Decrement indent', uno: 'DecrementIndent', iconName: 'decrementindent.png'}, - 'save': {title: 'Save', uno: 'Save', iconName: 'save.png'}, - 'saveas': {title: 'Save As', iconName: 'saveas.png'}, - 'undo': {title: 'Undo', uno: 'Undo', iconName: 'undo.png'}, - 'redo': {title: 'Redo', uno: 'Redo', iconName: 'redo.png'}, - 'presentation': {title: 'Present', iconName: 'presentation.png'} - }; - var separator = ['alignleft', 'save', 'undo', 'bullet', 'edit', 'presentation']; - for (var key in this._buttons) { - var button = this._buttons[key]; - if (separator.indexOf(key) >= 0) { - // add a separator - L.DomUtil.create('span', 'leaflet-control-button-separator', container); - } - button.el = this._createButton(key, button.title, button.iconName, - buttonsName, container, this._onButtonClick); - } - map.on('commandstatechanged', this._onStateChange, this); - map.on('updatepermission', this._onPermissionUpdate, this); - - return container; - }, - - _createButton: function (id, title, iconName, className, container, fn) { - var link = L.DomUtil.create('a', className, container); - link.href = '#'; - link.title = title; - var img = L.DomUtil.create('img', className, link); - img.id = id; - img.src = L.Icon.Default.imagePath + '/' + iconName; - - L.DomEvent - .on(link, 'mousedown dblclick', L.DomEvent.stopPropagation) - .on(link, 'click', L.DomEvent.stop) - .on(link, 'click', fn, this) - .on(link, 'click', this._refocusOnMap, this); - - return link; - }, - - _onButtonClick: function (e) { - var id = e.target.id; - var button = this._buttons[id]; - if (id === 'saveas') { - vex.dialog.open({ - message: 'Save as:', - input: this._getDialogHTML(), - callback: L.bind(this._onSaveAs, this) - }); - } - else if (button.uno && this._map._permission === 'edit') { - if (button.unosheet && this._map.getDocType() === 'spreadsheet') { - this._map.toggleCommandState(button.unosheet); - } - else { - this._map.toggleCommandState(button.uno); - } - } - else if (id === 'presentation') { - this._map.fire('fullscreen'); - } - }, - - _onStateChange: function (e) { - var commandName = e.commandName; - var state = e.state; - for (var key in this._buttons) { - var button = this._buttons[key]; - if ('.uno:' + button.uno === commandName) { - if (state === 'true') { - L.DomUtil.addClass(button.el.firstChild, 'leaflet-control-buttons-active'); - } - else if (state === 'false') { - L.DomUtil.removeClass(button.el.firstChild, 'leaflet-control-buttons-active'); - } - else if (state === 'enabled' && this._map._permission === 'edit') { - L.DomUtil.removeClass(button.el.firstChild, 'leaflet-control-buttons-disabled'); - } - else if (state === 'disabled') { - L.DomUtil.addClass(button.el.firstChild, 'leaflet-control-buttons-disabled'); - } - } - } - }, - - _getDialogHTML: function () { - return ( - '<label for="url">URL</label>' + - '<input name="url" type="text" value=' + this._map._docLayer.options.doc + '/>' + - '<label for="format">Format</label>' + - '<input name="format" type="text" />' + - '<label for="options">Options</label>' + - '<input name="options" type="text" />'); - }, - - _onSaveAs: function (e) { - if (e !== false) { - this._map.saveAs(e.url, e.format, e.options); - } - }, - - _onPermissionUpdate: function (e) { - for (var id in this._buttons) { - var button = this._buttons[id]; - if (button.uno) { - if (e.perm !== 'edit') { - L.DomUtil.addClass(button.el.firstChild, 'leaflet-control-buttons-disabled'); - } - else { - L.DomUtil.removeClass(button.el.firstChild, 'leaflet-control-buttons-disabled'); - } - } - else if (id === 'edit') { - if (e.perm === 'edit') { - L.DomUtil.addClass(button.el.firstChild, 'leaflet-control-buttons-active'); - L.DomUtil.removeClass(button.el.firstChild, 'leaflet-control-buttons-disabled'); - } - else if (e.perm === 'view') { - L.DomUtil.removeClass(button.el.firstChild, 'leaflet-control-buttons-active'); - L.DomUtil.removeClass(button.el.firstChild, 'leaflet-control-buttons-disabled'); - } - else if (e.perm === 'readonly') { - L.DomUtil.removeClass(button.el.firstChild, 'leaflet-control-buttons-active'); - L.DomUtil.addClass(button.el.firstChild, 'leaflet-control-buttons-disabled'); - } - } - else if (id === 'selection') { - if (e.perm === 'edit') { - L.DomUtil.addClass(button.el.firstChild, 'leaflet-control-buttons-active'); - L.DomUtil.addClass(button.el.firstChild, 'leaflet-control-buttons-disabled'); - } - else if (e.perm === 'view' || e.perm === 'readonly') { - L.DomUtil.removeClass(button.el.firstChild, 'leaflet-control-buttons-active'); - L.DomUtil.removeClass(button.el.firstChild, 'leaflet-control-buttons-disabled'); - } - } - } - } -}); - -L.control.buttons = function (options) { - return new L.Control.Buttons(options); -};
_______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
