From e316557ac8de5f1ea0b4c89e2bcfcd6648eacedb Mon Sep 17 00:00:00 2001 From: Manuel Friedli Date: Wed, 2 Jul 2014 19:21:50 +0200 Subject: [PATCH 1/8] added script which should convert normal links into javascript links --- index.html | 19 ++++++++++++ test.html | 90 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 109 insertions(+) create mode 100644 test.html diff --git a/index.html b/index.html index 8762468..59fad6b 100644 --- a/index.html +++ b/index.html @@ -29,6 +29,25 @@ along with this program. If not, see . +
diff --git a/test.html b/test.html new file mode 100644 index 0000000..f6cf045 --- /dev/null +++ b/test.html @@ -0,0 +1,90 @@ + + + + + Bärneruhr - TEST + + + + + + + + + + + + + + + + + + + + + +
+

Created by fritteli, inspired by QLOCKTWO. Read more! - View full showcase!

+ + + + + + + + + From 501dfb50bec1f50f32cc7074224db31c1bca363f Mon Sep 17 00:00:00 2001 From: Manuel Friedli Date: Wed, 16 Jul 2014 23:48:13 +0200 Subject: [PATCH 2/8] syntax fix --- index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.html b/index.html index 59fad6b..dc8ab4c 100644 --- a/index.html +++ b/index.html @@ -40,7 +40,7 @@ along with this program. If not, see . while (!(stop).test(curnode.nodeName)) { curnode = curnode.parentNode; } - if ('href' in curnode && (curnode.href.indexOf('http') || ~curnode.href.indexOf(location.host)) { + if ('href' in curnode && (curnode.href.indexOf('http') || ~curnode.href.indexOf(location.host))) { e.preventDefault(); location.href=curnode.href; } From ef4ec5fc4bb50eab6ad3e12d717d1a235f59fc77 Mon Sep 17 00:00:00 2001 From: Manuel Friedli Date: Thu, 28 Aug 2014 08:50:19 +0200 Subject: [PATCH 3/8] added $ to the closure --- js/uhr-de.js | 4 ++-- js/uhr-de_CH-seconds.js | 4 ++-- js/uhr-de_CH.js | 4 ++-- js/uhr-de_CH_genau.js | 4 ++-- js/uhr-en.js | 4 ++-- js/uhr-fr.js | 4 ++-- js/uhr-it.js | 4 ++-- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/js/uhr-de.js b/js/uhr-de.js index b63a1cf..cb8aef7 100644 --- a/js/uhr-de.js +++ b/js/uhr-de.js @@ -12,7 +12,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -(function() { +(function($) { 'use strict'; var es_ist = {1: [1, 2, 4, 5, 6]}; var uhr = {10: [9, 10, 11]}; @@ -71,4 +71,4 @@ } }; $.fritteli.uhr.register('de', layout); -}()); \ No newline at end of file +}(jQuery)); \ No newline at end of file diff --git a/js/uhr-de_CH-seconds.js b/js/uhr-de_CH-seconds.js index c5dc26b..c1c2368 100644 --- a/js/uhr-de_CH-seconds.js +++ b/js/uhr-de_CH-seconds.js @@ -16,7 +16,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -(function() { +(function($) { 'use strict'; var vorne0 = { 3: [2, 3, 4], @@ -244,4 +244,4 @@ } }; $.fritteli.uhr.register('de_CH_seconds', layout); -}()); +}(jQuery)); diff --git a/js/uhr-de_CH.js b/js/uhr-de_CH.js index 3d2945e..5cb8899 100644 --- a/js/uhr-de_CH.js +++ b/js/uhr-de_CH.js @@ -12,7 +12,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -(function() { +(function($) { 'use strict'; // hilfsvariablen var es_isch = {1: [1, 2, 4, 5, 6, 7]}; @@ -94,4 +94,4 @@ }; // Das Layout bei der Uhr unter dem Code "de_CH" registrieren. $.fritteli.uhr.register('de_CH', layout); -}()); \ No newline at end of file +}(jQuery)); \ No newline at end of file diff --git a/js/uhr-de_CH_genau.js b/js/uhr-de_CH_genau.js index 4181ccc..b130fa3 100644 --- a/js/uhr-de_CH_genau.js +++ b/js/uhr-de_CH_genau.js @@ -12,7 +12,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -(function() { +(function($) { 'use strict'; var es_isch = {1: [1, 2, 4, 5, 6, 7]}; var genau = {3: [7, 8, 9, 10, 11]}; @@ -69,4 +69,4 @@ } }; $.fritteli.uhr.register('de_CH_genau', layout); -}()); \ No newline at end of file +}(jQuery)); \ No newline at end of file diff --git a/js/uhr-en.js b/js/uhr-en.js index f5ed95f..a660266 100644 --- a/js/uhr-en.js +++ b/js/uhr-en.js @@ -12,7 +12,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -(function() { +(function($) { 'use strict'; var it_is = {1: [1, 2, 4, 5]}; var half = {4: [1, 2, 3, 4]}; @@ -78,4 +78,4 @@ } }; $.fritteli.uhr.register('en', layout); -}()); \ No newline at end of file +}(jQuery)); \ No newline at end of file diff --git a/js/uhr-fr.js b/js/uhr-fr.js index bcf375e..4a8d3d2 100644 --- a/js/uhr-fr.js +++ b/js/uhr-fr.js @@ -12,7 +12,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -(function() { +(function($) { 'use strict'; var il_est = {1: [1, 2, 4, 5, 6]}; var et = {8: [1, 2]}; @@ -112,4 +112,4 @@ } }; $.fritteli.uhr.register('fr', layout); -}()); \ No newline at end of file +}(jQuery)); \ No newline at end of file diff --git a/js/uhr-it.js b/js/uhr-it.js index 4f6e706..0375529 100644 --- a/js/uhr-it.js +++ b/js/uhr-it.js @@ -12,7 +12,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -(function() { +(function($) { 'use strict'; var sono_le = {1: [1, 2, 3, 4, 6, 7]}; var e_l = {2: [1, 3, 4]}; @@ -77,4 +77,4 @@ } }; $.fritteli.uhr.register('it', layout); -}()); \ No newline at end of file +}(jQuery)); \ No newline at end of file From 7afe681ec201b8dd29c7ee62b9efed87dc7d4531 Mon Sep 17 00:00:00 2001 From: Manuel Friedli Date: Thu, 28 Aug 2014 08:53:09 +0200 Subject: [PATCH 4/8] updated version --- VERSION | 2 +- manifest.appcache | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/VERSION b/VERSION index dc0208a..91e4a9f 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -6.3.1 +6.3.2 diff --git a/manifest.appcache b/manifest.appcache index 8d84dd3..d57a989 100644 --- a/manifest.appcache +++ b/manifest.appcache @@ -1,5 +1,5 @@ CACHE MANIFEST -# 6.3.1 +# 6.3.2 css/uhr.css css/uhr-black.css From 4ba32fc4430a0026b5d06dc715cc9d67ec437f39 Mon Sep 17 00:00:00 2001 From: Manuel Friedli Date: Tue, 2 Sep 2014 18:37:10 +0200 Subject: [PATCH 5/8] deleted the link to the showcase and the showcase directory itself. resolves issue #5. --- index.html | 2 +- showcase/index.html | 64 --------------------------------------------- 2 files changed, 1 insertion(+), 65 deletions(-) delete mode 100644 showcase/index.html diff --git a/index.html b/index.html index 578d904..0b77afd 100644 --- a/index.html +++ b/index.html @@ -46,7 +46,7 @@ along with this program. If not, see .

Created by fritteli, inspired by QLOCKTWO. Read more! - View full showcase!

+ href="info/">Read more!

- - - - - -
-

Go back to the main page

- - - - - - - - - - From a5599242f65b6a368c608c701a34f8250f42519c Mon Sep 17 00:00:00 2001 From: Manuel Friedli Date: Tue, 2 Sep 2014 18:53:20 +0200 Subject: [PATCH 6/8] replaced all important links with javascript links, thus effectively enabling the app to be a true offline app. --- index.html | 23 +++++------------------ info/index.html | 12 +++++++++--- 2 files changed, 14 insertions(+), 21 deletions(-) diff --git a/index.html b/index.html index 707112e..c78c8c3 100644 --- a/index.html +++ b/index.html @@ -43,29 +43,16 @@ along with this program. If not, see .

Created by fritteli, inspired by QLOCKTWO. Read more! - View full showcase!

+ onclick="go('info/')" href="#">Read more! - View full showcase!

+

Die Zeit im Wort

@@ -59,10 +65,10 @@ along with this program. If not, see . Website einbauen kannst. Denn das darfst du gerne tun, solange du dich dabei an die Regeln der Lizenz hältst.

-

Das interessiert mich nicht, ich will zurück zur grossen Uhr!

+

Das interessiert mich nicht, ich will zurück zur grossen Uhr!

Die UhrZum Inhalt

- +
@@ -191,7 +197,7 @@ along with this program. If not, see . oder ein gravierender Nachteil erwachsen, so soll sich diese Person bei mir melden und wir werden bestimmt eine Lösung finden, die für alle beteiligten angemessen ist. Allen anderen Personen wünsche ich viel Freude mit der Zeit im Wort.

-

Der Quellcode ist frei zugänglich unter https://git.friedli.info/manuel/uhr.

+

Der Quellcode ist frei zugänglich unter https://gittr.ch/manuel/uhr.

LizenzbestimmungenZum Inhalt

From 87d2a012445d8d54e64e3326ab18811a9fa475f4 Mon Sep 17 00:00:00 2001 From: Manuel Friedli Date: Tue, 2 Sep 2014 18:55:09 +0200 Subject: [PATCH 7/8] removed test.html --- test.html | 90 ------------------------------------------------------- 1 file changed, 90 deletions(-) delete mode 100644 test.html diff --git a/test.html b/test.html deleted file mode 100644 index f6cf045..0000000 --- a/test.html +++ /dev/null @@ -1,90 +0,0 @@ - - - - - Bärneruhr - TEST - - - - - - - - - - - - - - - - - - - - - -
-

Created by fritteli, inspired by QLOCKTWO. Read more! - View full showcase!

- - - - - - - - - From 8a18858bd1771cc21f8e16f0e1a44daa112a0ab6 Mon Sep 17 00:00:00 2001 From: Manuel Friedli Date: Wed, 3 Sep 2014 15:18:24 +0200 Subject: [PATCH 8/8] increment version number, update manifest.appcache --- VERSION | 2 +- manifest.appcache | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/VERSION b/VERSION index 91e4a9f..7849b73 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -6.3.2 +6.3.3 diff --git a/manifest.appcache b/manifest.appcache index d57a989..8fac742 100644 --- a/manifest.appcache +++ b/manifest.appcache @@ -1,5 +1,5 @@ CACHE MANIFEST -# 6.3.2 +# 6.3.3 css/uhr.css css/uhr-black.css @@ -27,7 +27,6 @@ resources/close.png resources/favicon.png resources/settings.png resources/uhr.woff -showcase/index.html COPYING README.md VERSION