[Libreoffice-commits] online.git: 2 commits - loleaflet/debug loleaflet/dist loleaflet/.eslintignore loleaflet/Makefile loleaflet/spec loleaflet/src
Jan Holesovsky
kendy at collabora.com
Tue Mar 1 09:44:46 UTC 2016
loleaflet/.eslintignore | 4
loleaflet/Makefile | 2
loleaflet/debug/document/document_simple_example.html | 12
loleaflet/dist/contextMenu/jquery.contextMenu.css | 206 +
loleaflet/dist/contextMenu/jquery.contextMenu.js | 1898 ++++++++++++++
loleaflet/dist/contextMenu/jquery.ui.position.min.js | 4
loleaflet/dist/loleaflet.html | 10
loleaflet/dist/scrollbar/jquery-1.11.0.min.js | 4
loleaflet/dist/scrollbar/jquery.mCustomScrollbar.css | 1267 +++++++++
loleaflet/dist/scrollbar/jquery.mCustomScrollbar.js | 2425 ++++++++++++++++++
loleaflet/spec/loadtest.html | 12
loleaflet/src/contextMenu/jquery.contextMenu.css | 206 -
loleaflet/src/contextMenu/jquery.contextMenu.js | 1898 --------------
loleaflet/src/contextMenu/jquery.ui.position.min.js | 4
loleaflet/src/scrollbar/jquery-1.11.0.min.js | 4
loleaflet/src/scrollbar/jquery.mCustomScrollbar.css | 1267 ---------
loleaflet/src/scrollbar/jquery.mCustomScrollbar.js | 2425 ------------------
17 files changed, 5824 insertions(+), 5824 deletions(-)
New commits:
commit 70a60dbadcad8f2396e3e6cd27112c5e1af17273
Author: Jan Holesovsky <kendy at collabora.com>
Date: Tue Mar 1 10:32:25 2016 +0100
loleaflet: Move the contextMenu to dist/.
diff --git a/loleaflet/.eslintignore b/loleaflet/.eslintignore
index ed74152..dfbe7ac 100644
--- a/loleaflet/.eslintignore
+++ b/loleaflet/.eslintignore
@@ -1,2 +1,2 @@
dist/scrollbar
-src/contextMenu
+dist/contextMenu
diff --git a/loleaflet/Makefile b/loleaflet/Makefile
index 4cbbcab..8228466 100644
--- a/loleaflet/Makefile
+++ b/loleaflet/Makefile
@@ -19,7 +19,7 @@ dist: all
mkdir loleaflet-$(VERSION)
cp README loleaflet-$(VERSION)
cp reference.html loleaflet-$(VERSION)
- tar cf - dist plugins/draw-$(DRAW_VERSION)/dist debug/document src/contextMenu docs spec \
+ tar cf - dist plugins/draw-$(DRAW_VERSION)/dist debug/document docs spec \
node_modules/mocha/mocha.css \
node_modules/mocha/mocha.js \
node_modules/happen/happen.js \
diff --git a/loleaflet/debug/document/document_simple_example.html b/loleaflet/debug/document/document_simple_example.html
index e00733f..482ff48 100644
--- a/loleaflet/debug/document/document_simple_example.html
+++ b/loleaflet/debug/document/document_simple_example.html
@@ -16,7 +16,7 @@
<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="../../src/contextMenu/jquery.contextMenu.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" />
@@ -28,8 +28,8 @@
<script src="http://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="../../src/contextMenu/jquery.ui.position.min.js"></script>
- <script src="../../src/contextMenu/jquery.contextMenu.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>
diff --git a/loleaflet/src/contextMenu/jquery.contextMenu.css b/loleaflet/dist/contextMenu/jquery.contextMenu.css
similarity index 100%
rename from loleaflet/src/contextMenu/jquery.contextMenu.css
rename to loleaflet/dist/contextMenu/jquery.contextMenu.css
diff --git a/loleaflet/src/contextMenu/jquery.contextMenu.js b/loleaflet/dist/contextMenu/jquery.contextMenu.js
similarity index 100%
rename from loleaflet/src/contextMenu/jquery.contextMenu.js
rename to loleaflet/dist/contextMenu/jquery.contextMenu.js
diff --git a/loleaflet/src/contextMenu/jquery.ui.position.min.js b/loleaflet/dist/contextMenu/jquery.ui.position.min.js
similarity index 100%
rename from loleaflet/src/contextMenu/jquery.ui.position.min.js
rename to loleaflet/dist/contextMenu/jquery.ui.position.min.js
diff --git a/loleaflet/dist/loleaflet.html b/loleaflet/dist/loleaflet.html
index bc4113d..c001d1f 100644
--- a/loleaflet/dist/loleaflet.html
+++ b/loleaflet/dist/loleaflet.html
@@ -17,7 +17,7 @@
<link rel="stylesheet" href="/loleaflet/dist/branding.css"> <!-- add your logo here -->
<link rel="stylesheet" href="/loleaflet/plugins/draw-0.2.4/dist/leaflet.draw.css">
<link rel="stylesheet" href="/loleaflet/dist/scrollbar/jquery.mCustomScrollbar.css">
-<link rel="stylesheet" href="/loleaflet/src/contextMenu/jquery.contextMenu.css">
+<link rel="stylesheet" href="/loleaflet/dist/contextMenu/jquery.contextMenu.css">
<link rel="stylesheet" href="/loleaflet/dist/dialog/vex.css" />
<link rel="stylesheet" href="/loleaflet/dist/dialog/vex-theme-plain.css" />
<link rel="stylesheet" href="/loleaflet/dist/toolbar/w2ui.min.css" />
@@ -39,8 +39,8 @@
<script src="/loleaflet/dist/leaflet-src.js"></script>
<script src="/loleaflet/plugins/draw-0.2.4/dist/leaflet.draw.js"></script>
<script src="/loleaflet/dist/scrollbar/jquery.mCustomScrollbar.js"></script>
- <script src="/loleaflet/src/contextMenu/jquery.contextMenu.js"></script>
- <script src="/loleaflet/src/contextMenu/jquery.ui.position.min.js"></script>
+ <script src="/loleaflet/dist/contextMenu/jquery.contextMenu.js"></script>
+ <script src="/loleaflet/dist/contextMenu/jquery.ui.position.min.js"></script>
<script src="/loleaflet/dist/dialog/vex.combined.min.js"></script>
<script src="/loleaflet/dist/branding.js"></script> <!-- logo onclick handler -->
<script>vex.defaultOptions.className = 'vex-theme-plain';</script>
diff --git a/loleaflet/spec/loadtest.html b/loleaflet/spec/loadtest.html
index d1b67d1..4734ff1 100644
--- a/loleaflet/spec/loadtest.html
+++ b/loleaflet/spec/loadtest.html
@@ -6,7 +6,7 @@
<link rel="stylesheet" type="text/css" href="../node_modules/mocha/mocha.css">
<link rel="stylesheet" type="text/css" href="../dist/leaflet.css">
<link rel="stylesheet" type="text/css" href="../dist/scrollbar/jquery.mCustomScrollbar.css">
- <link rel="stylesheet" type="text/css" href="../src/contextMenu/jquery.contextMenu.css">
+ <link rel="stylesheet" type="text/css" href="../dist/contextMenu/jquery.contextMenu.css">
<link rel="stylesheet" type="text/css" href="../dist/dialog/vex.css" />
<link rel="stylesheet" type="text/css" href="../dist/dialog/vex-theme-plain.css" />
</head>
@@ -18,8 +18,8 @@
<script src="http://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="../src/contextMenu/jquery.contextMenu.js"></script>
- <script src="../src/contextMenu/jquery.ui.position.min.js"></script>
+ <script src="../dist/contextMenu/jquery.contextMenu.js"></script>
+ <script src="../dist/contextMenu/jquery.ui.position.min.js"></script>
<script src="../dist/dialog/vex.combined.min.js"></script>
<script>vex.defaultOptions.className = 'vex-theme-plain';</script>
commit 0b2bf15ddd4151045d57333419173acd767b1fdc
Author: Jan Holesovsky <kendy at collabora.com>
Date: Tue Mar 1 10:29:37 2016 +0100
loleaflet: Move the scrollbar to dist/.
diff --git a/loleaflet/.eslintignore b/loleaflet/.eslintignore
index 9474c51..ed74152 100644
--- a/loleaflet/.eslintignore
+++ b/loleaflet/.eslintignore
@@ -1,2 +1,2 @@
-src/scrollbar
+dist/scrollbar
src/contextMenu
diff --git a/loleaflet/Makefile b/loleaflet/Makefile
index 36ba743..4cbbcab 100644
--- a/loleaflet/Makefile
+++ b/loleaflet/Makefile
@@ -19,7 +19,7 @@ dist: all
mkdir loleaflet-$(VERSION)
cp README loleaflet-$(VERSION)
cp reference.html loleaflet-$(VERSION)
- tar cf - dist plugins/draw-$(DRAW_VERSION)/dist debug/document src/scrollbar src/contextMenu docs spec \
+ tar cf - dist plugins/draw-$(DRAW_VERSION)/dist debug/document src/contextMenu docs spec \
node_modules/mocha/mocha.css \
node_modules/mocha/mocha.js \
node_modules/happen/happen.js \
diff --git a/loleaflet/debug/document/document_simple_example.html b/loleaflet/debug/document/document_simple_example.html
index 001da3e..e00733f 100644
--- a/loleaflet/debug/document/document_simple_example.html
+++ b/loleaflet/debug/document/document_simple_example.html
@@ -15,7 +15,7 @@
<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="../../src/scrollbar/jquery.mCustomScrollbar.css">
+<link rel="stylesheet" href="../../dist/scrollbar/jquery.mCustomScrollbar.css">
<link rel="stylesheet" href="../../src/contextMenu/jquery.contextMenu.css">
<link rel="stylesheet" href="../../dist/dialog/vex.css" />
<link rel="stylesheet" href="../../dist/dialog/vex-theme-plain.css" />
@@ -26,8 +26,8 @@
<script src="../../dist/leaflet-src.js"></script>
<script src="../../plugins/draw-0.2.4/dist/leaflet.draw.js"></script>
<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.11.0/jquery.min.js"></script>
- <script>window.jQuery || document.write('<script src="../../src/scrollbar/jquery-1.11.0.min.js"><\/script>')</script>
- <script src="../../src/scrollbar/jquery.mCustomScrollbar.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="../../src/contextMenu/jquery.ui.position.min.js"></script>
<script src="../../src/contextMenu/jquery.contextMenu.js"></script>
<script src="../../dist/dialog/vex.combined.min.js"></script>
diff --git a/loleaflet/dist/loleaflet.html b/loleaflet/dist/loleaflet.html
index 4d23a11..bc4113d 100644
--- a/loleaflet/dist/loleaflet.html
+++ b/loleaflet/dist/loleaflet.html
@@ -16,7 +16,7 @@
<link rel="stylesheet" href="/loleaflet/dist/spreadsheet.css">
<link rel="stylesheet" href="/loleaflet/dist/branding.css"> <!-- add your logo here -->
<link rel="stylesheet" href="/loleaflet/plugins/draw-0.2.4/dist/leaflet.draw.css">
-<link rel="stylesheet" href="/loleaflet/src/scrollbar/jquery.mCustomScrollbar.css">
+<link rel="stylesheet" href="/loleaflet/dist/scrollbar/jquery.mCustomScrollbar.css">
<link rel="stylesheet" href="/loleaflet/src/contextMenu/jquery.contextMenu.css">
<link rel="stylesheet" href="/loleaflet/dist/dialog/vex.css" />
<link rel="stylesheet" href="/loleaflet/dist/dialog/vex-theme-plain.css" />
@@ -38,7 +38,7 @@
<script src="/loleaflet/dist/toolbar/jquery.simplemodal.1.4.4.min.js"></script>
<script src="/loleaflet/dist/leaflet-src.js"></script>
<script src="/loleaflet/plugins/draw-0.2.4/dist/leaflet.draw.js"></script>
- <script src="/loleaflet/src/scrollbar/jquery.mCustomScrollbar.js"></script>
+ <script src="/loleaflet/dist/scrollbar/jquery.mCustomScrollbar.js"></script>
<script src="/loleaflet/src/contextMenu/jquery.contextMenu.js"></script>
<script src="/loleaflet/src/contextMenu/jquery.ui.position.min.js"></script>
<script src="/loleaflet/dist/dialog/vex.combined.min.js"></script>
diff --git a/loleaflet/src/scrollbar/jquery-1.11.0.min.js b/loleaflet/dist/scrollbar/jquery-1.11.0.min.js
similarity index 100%
rename from loleaflet/src/scrollbar/jquery-1.11.0.min.js
rename to loleaflet/dist/scrollbar/jquery-1.11.0.min.js
diff --git a/loleaflet/src/scrollbar/jquery.mCustomScrollbar.css b/loleaflet/dist/scrollbar/jquery.mCustomScrollbar.css
similarity index 100%
rename from loleaflet/src/scrollbar/jquery.mCustomScrollbar.css
rename to loleaflet/dist/scrollbar/jquery.mCustomScrollbar.css
diff --git a/loleaflet/src/scrollbar/jquery.mCustomScrollbar.js b/loleaflet/dist/scrollbar/jquery.mCustomScrollbar.js
similarity index 100%
rename from loleaflet/src/scrollbar/jquery.mCustomScrollbar.js
rename to loleaflet/dist/scrollbar/jquery.mCustomScrollbar.js
diff --git a/loleaflet/spec/loadtest.html b/loleaflet/spec/loadtest.html
index 23f28c5..d1b67d1 100644
--- a/loleaflet/spec/loadtest.html
+++ b/loleaflet/spec/loadtest.html
@@ -5,7 +5,7 @@
<title>LOOL Spec Runner</title>
<link rel="stylesheet" type="text/css" href="../node_modules/mocha/mocha.css">
<link rel="stylesheet" type="text/css" href="../dist/leaflet.css">
- <link rel="stylesheet" type="text/css" href="../src/scrollbar/jquery.mCustomScrollbar.css">
+ <link rel="stylesheet" type="text/css" href="../dist/scrollbar/jquery.mCustomScrollbar.css">
<link rel="stylesheet" type="text/css" href="../src/contextMenu/jquery.contextMenu.css">
<link rel="stylesheet" type="text/css" href="../dist/dialog/vex.css" />
<link rel="stylesheet" type="text/css" href="../dist/dialog/vex-theme-plain.css" />
@@ -16,8 +16,8 @@
<script type="text/javascript" src="../node_modules/happen/happen.js"></script>
<script type="text/javascript" src="sinon.js"></script>
<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.11.0/jquery.min.js"></script>
- <script>window.jQuery || document.write('<script src="../src/scrollbar/jquery-1.11.0.min.js"><\/script>')</script>
- <script src="../src/scrollbar/jquery.mCustomScrollbar.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="../src/contextMenu/jquery.contextMenu.js"></script>
<script src="../src/contextMenu/jquery.ui.position.min.js"></script>
<script src="../dist/dialog/vex.combined.min.js"></script>
More information about the Libreoffice-commits
mailing list