tinker

angular app scaffold.

.angular-cli.json

@@ -0,0 +1,60 @@
+{
+  "$schema": "./node_modules/@angular/cli/lib/config/schema.json",
+  "project": {
+    "name": "uhr"
+  },
+  "apps": [
+    {
+      "root": "src",
+      "outDir": "dist",
+      "assets": [
+        "assets",
+        "favicon.ico"
+      ],
+      "index": "index.html",
+      "main": "main.ts",
+      "polyfills": "polyfills.ts",
+      "test": "test.ts",
+      "tsconfig": "tsconfig.app.json",
+      "testTsconfig": "tsconfig.spec.json",
+      "prefix": "app",
+      "styles": [
+        "styles.scss"
+      ],
+      "scripts": [],
+      "environmentSource": "environments/environment.ts",
+      "environments": {
+        "dev": "environments/environment.ts",
+        "prod": "environments/environment.prod.ts"
+      }
+    }
+  ],
+  "e2e": {
+    "protractor": {
+      "config": "./protractor.conf.js"
+    }
+  },
+  "lint": [
+    {
+      "project": "src/tsconfig.app.json",
+      "exclude": "**/node_modules/**"
+    },
+    {
+      "project": "src/tsconfig.spec.json",
+      "exclude": "**/node_modules/**"
+    },
+    {
+      "project": "e2e/tsconfig.e2e.json",
+      "exclude": "**/node_modules/**"
+    }
+  ],
+  "test": {
+    "karma": {
+      "config": "./karma.conf.js"
+    }
+  },
+  "defaults": {
+    "styleExt": "scss",
+    "component": {}
+  }
+}

.drone.yml

@@ -1,13 +0,0 @@
-kind: pipeline
-type: docker
-name: default
-
-steps:
-  - name: prepare
-    image: node:15-alpine
-    commands:
-      - npm install
-  - name: build
-    image: node:15-alpine
-    commands:
-      - npm run build

.editorconfig

@@ -1,15 +1,13 @@
-# http://editorconfig.org
+# Editor configuration, see http://editorconfig.org
 root = true
 
 [*]
-indent_style = space
-indent_size = 4
-end_of_line = lf
 charset = utf-8
-trim_trailing_whitespace = true
+indent_style = space
-insert_final_newline = true
-
-[*.yml]
 indent_size = 2
+insert_final_newline = true
+trim_trailing_whitespace = true
+
 [*.md]
+max_line_length = off
 trim_trailing_whitespace = false

.gitignore

@@ -1,6 +1,44 @@
-*~
+# See http://help.github.com/ignore-files/ for more about ignoring files.
-.idea
+
-*.iml
+# compiled output
+/dist
+/tmp
+/out-tsc
+
+# dependencies
+/node_modules
+
+# IDEs and editors
+/.idea
+.project
+.classpath
 atlassian-ide-plugin.xml
-/node_modules/
+.c9/
-/bower_components/
+*.launch
+.settings/
+*.sublime-workspace
+*~
+
+# IDE - VSCode
+.vscode/*
+!.vscode/settings.json
+!.vscode/tasks.json
+!.vscode/launch.json
+!.vscode/extensions.json
+
+# misc
+/.sass-cache
+/connect.lock
+/coverage
+/libpeerconnection.log
+npm-debug.log
+testem.log
+/typings
+
+# e2e
+/e2e/*.js
+/e2e/*.map
+
+# System Files
+.DS_Store
+Thumbs.db

.gitlab-ci.yml

@@ -0,0 +1,75 @@
+variables:
+  NPMPATH: "node_modules/.bin"
+
+stages:
+  - build
+  - cleanup_build
+  - deploy
+  - cleanup
+
+.run_deploy: &run_deploy
+  script:
+    - chmod +x ./deploy.sh
+    - ./deploy.sh
+
+build_job:
+  stage: build
+  script:
+    - npm install
+    - $NPMPATH/grunt
+  tags:
+    - javascript
+  except:
+    - tags
+  artifacts:
+    paths:
+      - dist/*.min.*
+      - info/
+      - resources/
+      - index.html
+      - manifest.appcache
+
+cleanup_build_job:
+  stage: cleanup_build
+  script:
+    - rm -rf node_modules
+    - rm -rf dist
+  when: on_failure
+
+develop:
+  stage: deploy
+  <<: *run_deploy
+  environment: develop
+  except:
+    - tags
+    - master
+    - develop
+  variables:
+    ENVIRON: develop
+    TARGET: $WWW_DEPLOY_ROOT_DEVELOP
+
+staging:
+  stage: deploy
+  <<: *run_deploy
+  environment: staging
+  only:
+    - develop
+  variables:
+    ENVIRON: staging
+    TARGET: $WWW_DEPLOY_ROOT_STAGING
+
+production:
+  stage: deploy
+  <<: *run_deploy
+  environment: production
+  only:
+    - master
+  variables:
+    ENVIRON: production
+    TARGET: $WWW_DEPLOY_ROOT_PRODUCTION
+
+cleanup_job:
+  stage: cleanup
+  script:
+    - rm -rf node_modules
+  when: always

README.md

@@ -1,7 +1,10 @@
-# Bärneruhr
+Bärneruhr
+=========
+
 Du willst Bärneruhr auf deiner Website verwenden? Dank des jQuery-Plugins geht das so einfach, dass es sogar deine Grossmutter tun könnte!
 
-## 1. Benötigte Dateien einbinden
+1. Benötigte Dateien einbinden
+------------------------------
 * Binde folgende CSS-Datei im HTML-Dokument ein:
 	* dist/uhr.min.css
 * Binde zusätzlich mindestens eine der folgenden CSS-Dateien im HTML ein, je nach dem, welche Farben deine Uhr unterstützen soll:
@@ -22,10 +25,10 @@ Beim Einbinden muss das attribut `data-class` angegeben werden, welches die CSS-
 * Binde nach den CSS-Dateien (wichtig!) folgende Javascript-Dateien im HTML-Dokument ein:
 	* dist/libs.min.js: Dies enthält die minifizierten Versionen von jQuery, jQuery-UI (mit den Komponenten `code` und `widget`) und jQuery-Cookie.
 Alternativ kannst Du auch direkt die benötigten Bibliotheken einbinden:
-		* jquery (getestet mit Version 3.4.1)
+	* jquery (getestet mit Version 2.1.0)
-		* jquery-ui (getestet mit Version 1.12.1)
+	* jquery-ui (getestet mit Version 1.10.4)
-			* Von jquery-ui wird die Komponente 'widget' benötigt.
+		* Von jquery-ui werden die Komponenten 'core' und 'widget' benötigt.
-		* jquery-cookie (getestet mit Version 1.4.1)
+	* jquery-cookie (getestet mit Version 1.4.0)
 Je nach dem, in welchen Sprachen du die Uhr verwenden willst, noch eine der folgenden Dateien:
 	* dist/jquery.uhr.complete.min.js: Enthält die Hauptdatei sowie alle unterstützten Sprachdateien
 	* dist/jquery.uhr.base.min.js: Enthält die Hauptdatei sowie Bärndütsch (de_CH)
@@ -47,14 +50,16 @@ Je nach dem, in welchen Sprachen du die Uhr verwenden willst, noch eine der folg
 
 `src/uhr-de_CH_genau.js` ist eine Variante von Bärndütsch, bei der zur vollen Stunde zusätzlich das Wort "genau" angezeigt wird (also z.B. um 15:00 Uhr "ES ISCH GENAU DRÜ" anstelle von "ES ISCH DRÜ").
 
-## 2. Uhr-Element im HTML-Dokument einfügen
+2. Uhr-Element im HTML-Dokument einfügen
+----------------------------------------
 Erstelle ein leeres `<div>` mit einer ID:
 
 ```html
 <div id="uhrcontainer"></div>
 ```
 
-## 3. Uhr per Javascript konfigurieren
+3. Uhr per Javascript konfigurieren
+-----------------------------------
 Initialisiere die Uhr mit einer einzigen Zeile Javascript:
 
 ```javascript
@@ -83,7 +88,8 @@ jQuery('div').uhr();
 
 würde also jedes `<div>`-Element der Seite in eine Uhr umgewandelt.
 
-## 4. Weitere Optionen
+4. Weitere Optionen
+-------------------
 Der uhr()-Methode kann ein Options-Objekt mitgegeben werden:
 
 ```javascript
@@ -93,7 +99,7 @@ jQuery('#uhrcontainer').uhr({
 	language: 'de_CH',    // 'de_CH' (default), 'de_CH_genau', 'de', 'dk', 'en', 'es', 'fr', 'it', 'nl' oder 'pt' (je nach eingebundenen Sprachdateien)
 	mode: 'normal',       // 'normal' (default): Die Uhr zeigt die aktuelle Zeit (Stunden und Minuten) in Worten an
 	                      // 'seconds': Die Uhr zeigt die aktuellen Sekunden als grosse Ziffern an
-	width: '100%',        // Eine CSS-Grössenangabe (default: 100%)
+	width: '100%',        // eine CSS-Grössenangabe (default: 100%)
 	force: false,         // false (default): Falls ein Cookie im Browser besteht, werden dessen Konfigurationswerte übernommen;
 	                      // true: immer die angegebene Konfiguration verwenden
 	controls: true,       // true (default): Die Bedienelemente (Ein-/Ausschalter, Theme-, Zeitmodus- und Sprachwähler) werden angezeigt
@@ -104,7 +110,8 @@ jQuery('#uhrcontainer').uhr({
 });
 ```
 
-## 5. Sonderfunktionen
+5. Sonderfunktionen
+-------------------
 Es gibt noch einen zusätzlichen Konfigurationsparameter. Mittels
 
 ```javascript
@@ -120,8 +127,9 @@ Die Zeit kann auch über einen Methodenaufruf dynamisch eingestellt werden:
 jQuery('#uhrcontainer').uhr("time", new Date());
 ```
 
-## 6. Konfiguration über die URL
+6. Konfiguration über die URL
-Es ist möglich, die Uhr durch den Aufruf mit URL-Parametern zu konfigurieren. Dies übersteuert auch allfällig bereits in einem Cookie gespeicherte Einstellungen. Die Einstellungen werden für alle Uhr-Elemente übernommen, welche sich auf der Seite befinden. Folgende Parameter werden unterstützt, wenn du sie mit einem Hash (`#`) an die URL anhängst:
+-----------------------------
+Es ist möglich, die Uhr durch den Aufruf mit URL-Parameters zu konfigurieren. Dies übersteuert auch allfällig bereits in einem Cookie gespeicherte Einstellungen. Die Einstellungen werden für alle Uhr-Elemente übernommen, welche sich auf der Seite befinden. Folgende Parameter werden unterstützt, wenn du sie mit einem Hash (`#`) an die URL anhängst:
 
 * `l` oder `language`: Bestimmt die Sprache. Der Wert ist der Sprach-Code (abhängig von den eingebundenen Sprachdateien):
 	* de_CH: Bärndütsch
@@ -149,7 +157,7 @@ Es ist möglich, die Uhr durch den Aufruf mit URL-Parametern zu konfigurieren. D
 	* on: Die Uhr ist eingeschaltet
 	* off: Die Uhr ist ausgeschaltet
 
-Eine URL kann also beispielsweise so aussehen:
+Eine URL kann also beispielweise so aussehen:
 
 	http://example.com/uhr.html#l=fr&t=red&m=seconds&s=on
 
@@ -157,7 +165,8 @@ Dies zeigt dann die Uhr auf Französisch in Rot, im Sekunden-Modus und eingescha
 
 Viel Spass!
 
-# A. Lizenzbestimmungen
+A. Lizenzbestimmungen
+=====================
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation, either version 3 of the License, or

VERSION

@@ -1 +1 @@
-9.0.0-dev.0
+8.0.4-dev.0

_old/Gruntfile.js

@@ -0,0 +1,181 @@
+module.exports = function (grunt) {
+    'use strict';
+    // Load all grunt tasks
+    require('load-grunt-tasks')(grunt);
+    // Show elapsed time at the end
+    require('time-grunt')(grunt);
+
+    // Project configuration.
+    grunt.initConfig({
+        // Metadata.
+        pkg: grunt.file.readJSON('package.json'),
+        banner: '/*! <%= pkg.name %> - v<%= pkg.version %> - ' +
+        '<%= grunt.template.today("yyyy-mm-dd") %>\n' +
+        '<%= pkg.homepage ? "* " + pkg.homepage + "\\n" : "" %>' +
+        '* Copyright (c) <%= grunt.template.today("yyyy") %> <%= pkg.author.name %>;' +
+        ' Licensed <%= pkg.licenses[0].type %> */\n',
+        // Task configuration.
+        clean: {
+            files: ['dist']
+        },
+        concat: {
+            options: {
+                banner: '<%= banner %>',
+                stripBanners: true
+            },
+            libs: {
+                src: [
+                    'node_modules/jquery/dist/jquery.js',
+                    'node_modules/jquery-ui/ui/core.js',
+                    'node_modules/jquery-ui/ui/widget.js',
+                    'node_modules/jquery.cookie/jquery.cookie.js'
+                ],
+                dest: 'dist/libs.js'
+            },
+            dist: {
+                src: ['src/uhr.js', 'src/uhr-*.js'],
+                dest: 'dist/jquery.<%= pkg.name %>.complete.js'
+            },
+            main: {
+                src: ['src/uhr.js'],
+                dest: 'dist/jquery.<%= pkg.name %>.main.js'
+            },
+            base: {
+                src: ['src/uhr.js', 'src/uhr-de_CH.js'],
+                dest: 'dist/jquery.<%= pkg.name %>.base.js'
+            },
+            baselangs: {
+                src: ['src/uhr-*.js'],
+                exclude: ['src/uhr-de_CH.js'],
+                dest: 'dist/jquery.<%= pkg.name %>.baselangs.js'
+            },
+            langs: {
+                src: ['src/uhr-*.js'],
+                dest: 'dist/jquery.<%= pkg.name %>.langs.js'
+            }
+        },
+        uglify: {
+            options: {
+                banner: '<%= banner %>'
+            },
+            libs: {
+                src: '<%= concat.libs.dest %>',
+                dest: 'dist/libs.min.js'
+            },
+            dist: {
+                src: '<%= concat.dist.dest %>',
+                dest: 'dist/jquery.<%= pkg.name %>.complete.min.js'
+            },
+            main: {
+                src: '<%= concat.main.dest %>',
+                dest: 'dist/jquery.<%= pkg.name %>.main.min.js'
+            },
+            base: {
+                src: '<%= concat.base.dest %>',
+                dest: 'dist/jquery.<%= pkg.name %>.base.min.js'
+            },
+            baselangs: {
+                src: '<%= concat.baselangs.dest %>',
+                dest: 'dist/jquery.<%= pkg.name %>.baselangs.min.js'
+            },
+            langs: {
+                src: '<%= concat.langs.dest %>',
+                dest: 'dist/jquery.<%= pkg.name %>.langs.min.js'
+            }
+        },
+        cssmin: {
+            allcss: {
+                files: [{
+                    expand: true,
+                    cwd: 'css',
+                    src: ['*.css'],
+                    dest: 'dist',
+                    ext: '.min.css'
+                }]
+            }
+        },
+        mocha_phantomjs: {
+            all: {
+                options: {
+                    urls: ['http://localhost:9000/test/test.html']
+                }
+            }
+        },
+        jshint: {
+            options: {
+                reporter: require('jshint-stylish')
+            },
+            gruntfile: {
+                options: {
+                    jshintrc: '.jshintrc'
+                },
+                src: 'Gruntfile.js'
+            },
+            src: {
+                options: {
+                    jshintrc: '.jshintrc'
+                },
+                src: ['src/**/*.js']
+            },
+            test: {
+                options: {
+                    jshintrc: 'test/.jshintrc'
+                },
+                src: ['test/*.js']
+            }
+        },
+        watch: {
+            gruntfile: {
+                files: '<%= jshint.gruntfile.src %>',
+                tasks: ['jshint:gruntfile']
+            },
+            src: {
+                files: '<%= jshint.src.src %>',
+                tasks: ['jshint:src', 'mocha_phantomjs']
+            },
+            test: {
+                files: ['test/test.html', '<%= jshint.test.src %>'],
+                tasks: ['jshint:test', 'mocha_phantomjs']
+            }
+        },
+        connect: {
+            server: {
+                options: {
+                    hostname: '*',
+                    port: 9000
+                }
+            }
+        },
+        version: {
+            VERSION: {
+                options: {
+                    prefix: ''
+                },
+                src: ['VERSION']
+            },
+            bower: {
+                src: ['bower.json']
+            },
+            manifest: {
+                options: {
+                    prefix: 'Version\\s+'
+                },
+                src: ['manifest.appcache']
+            }
+        }
+    });
+
+    grunt.loadNpmTasks('grunt-mocha-phantomjs');
+    grunt.loadNpmTasks('grunt-contrib-cssmin');
+    grunt.loadNpmTasks('grunt-version');
+
+    // Default task.
+    grunt.registerTask('default', ['jshint', 'clean', 'version', 'concat', 'connect', 'mocha_phantomjs', 'uglify', 'cssmin']);
+    grunt.registerTask('buildonly', ['clean', 'version', 'concat', 'uglify', 'cssmin']);
+    grunt.registerTask('server', function () {
+        grunt.log.warn('The `server` task has been deprecated. Use `grunt serve` to start a server.');
+        grunt.task.run(['serve']);
+    });
+    grunt.registerTask('serve', ['connect', 'watch']);
+    grunt.registerTask('test', ['jshint', 'connect', 'mocha_phantomjs']);
+};

_old/deploy.sh

@@ -0,0 +1,23 @@
+#!/bin/sh
+
+declare destination
+case "${TARGET}" in
+	"${WWW_DEPLOY_ROOT_DEVELOP}")
+		destination="${TARGET}/${CI_BUILD_REF_NAME}"
+		;;
+	"${WWW_DEPLOY_ROOT_STAGING}"|"${WWW_DEPLOY_ROOT_PRODUCTION}")
+		destination="${TARGET}"
+		;;
+	*)
+		echo "Invalid TARGET specified. Aborting deployment."
+		exit 1
+		;;
+esac
+
+rm -rf "${destination}/*"
+rm -rf "${destination}/.??*"
+mkdir -p "${destination}/dist"
+cp -a index.html manifest.appcache info resources "${destination}"
+cp -a dist/*.min.* "${destination}/dist"
+
+echo "Deployment successful."

_old/dist/jquery.uhr.baselangs.js

@@ -1,20 +1,8 @@
-'use strict';
+/*! uhr - v8.0.4-dev.0 - 2016-06-27
-
+* http://bärneruhr.ch/
-/*
+* Copyright (c) 2016 Manuel Friedli; Licensed GPL-3.0 */
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
 (function($) {
+    'use strict';
     var es_ist = {1: [1, 2, 4, 5, 6]};
     var uhr = {10: [9, 10, 11]};
     var nach = {4: [8, 9, 10, 11]};
@@ -73,22 +61,91 @@
     };
     $.fritteli.uhr.register('de', layout);
 }(jQuery));
-
-/*
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
 (function($) {
+    'use strict';
+// hilfsvariablen
+    var es_isch = {1: [1, 2, 4, 5, 6, 7]};
+    var ab = {4: [1, 2]};
+    var vor = {3: [9, 10, 11]};
+    var haubi = {4: [4, 5, 6, 7, 8]};
+    var fuef = {1: [9, 10, 11]};
+    var zae = {2: [9, 10, 11]};
+    var viertu = {2: [1, 2, 3, 4, 5, 6]};
+    var zwaenzg = {3: [1, 2, 3, 4, 5, 6]};
+    var layout = {
+        // version: zur Zeit immer 2 (Pflichtattribut)
+        "version": 2,
+        // Sprechender Name der Sprache
+        "language": 'Bärndütsch',
+        // Buchstabenfeld als Array von Strings.
+        "letters": [
+            'ESKISCHAFÜF',
+            'VIERTUBFZÄÄ',
+            'ZWÄNZGSIVOR',
+            'ABOHAUBIEGE',
+            'EISZWÖISDRÜ',
+            'VIERIFÜFIQT',
+            'SÄCHSISIBNI',
+            'ACHTINÜNIEL',
+            'ZÄNIERBEUFI',
+            'ZWÖUFINAUHR'
+        ],
+        // Permanent aktive Buchstaben. <array-or-object>, vgl. ausführliche Beschreibung bei "minutes".
+        "permanent": es_isch,
+        /*
+         * Minuten: Objekt im folgenden Format:
+         * {
+         *     <minuten>: <array-or-object>,
+         *     ...
+         * }
+         * <minuten>: String von Komma-separierten Minutenwerten, zu welchem die in <array-or-object> angegebenen Buchstaben aktiv sein sollen
+         * <array-or-object> : [ <object>, ...] | <object>
+         * <object>: { <zeile> : [ <spalte>, ... ] }
+         * <zeile>: Die Zeile, in welcher die Buchstaben liegen; von oben gezählt, oben ist 1.
+         * <spalte>: Die Spalte, in der ein einzelner Buchstabe liegt; von links gezählt, links ist 1.
+         * Beispiel:
+         * "minutes": {
+         *     "0,1": {1: [6, 7, 9]},
+         *     "5": [ {3: [1, 2]}, {4: [10, 11]} ]
+         * }
+         * Erklärung:
+         * Bei Minuten 0 und 1 sind die Buchstaben 6, 7 und 9 der ersten Zeile aktiv.
+         * Bei Minute 5 sind die Buchstaben 1 und 2 der Zeile 3 sowie die Buchstaben 10 und 11 der Zeile 4 aktiv.
+         */
+        "minutes": {
+            "5,6,7,8,9": [fuef, ab],
+            "10,11,12,13,14": [zae, ab],
+            "15,16,17,18,19": [viertu, ab],
+            "20,21,22,23,24": [zwaenzg, ab],
+            "25,26,27,28,29": [fuef, vor, haubi],
+            "30,31,32,33,34": haubi,
+            "35,36,37,38,39": [fuef, ab, haubi],
+            "40,41,42,43,44": [zwaenzg, vor],
+            "45,46,47,48,49": [viertu, vor],
+            "50,51,52,53,54": [zae, vor],
+            "55,56,57,58,59": [fuef, vor]
+        },
+        // Die Stunden; gleiches Format wie bei den Minuten
+        "hours": {
+            "0,12": {10: [1, 2, 3, 4, 5, 6]},
+            "1,13": {5: [1, 2, 3]},
+            "2,14": {5: [4, 5, 6, 7]},
+            "3,15": {5: [9, 10, 11]},
+            "4,16": {6: [1, 2, 3, 4, 5]},
+            "5,17": {6: [6, 7, 8, 9]},
+            "6,18": {7: [1, 2, 3, 4, 5, 6]},
+            "7,19": {7: [7, 8, 9, 10, 11]},
+            "8,20": {8: [1, 2, 3, 4, 5]},
+            "9,21": {8: [6, 7, 8, 9]},
+            "10,22": {9: [1, 2, 3, 4]},
+            "11,23": {9: [8, 9, 10, 11]}
+        }
+    };
+// Das Layout bei der Uhr unter dem Code "de_CH" registrieren.
+    $.fritteli.uhr.register('de_CH', layout);
+}(jQuery));
+(function($) {
+    'use strict';
     var es_isch = {1: [1, 2, 4, 5, 6, 7]};
     var genau = {3: [7, 8, 9, 10, 11]};
     var ab = {4: [4, 5]};
@@ -145,7 +202,6 @@
     };
     $.fritteli.uhr.register('de_CH_genau', layout);
 }(jQuery));
-
 /*
  This program is free software: you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
@@ -161,6 +217,7 @@
  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 (function($) {
+    'use strict';
 
     var klokken_er = {1: [1, 2, 3, 4, 5, 6, 7, 9, 10]};
     var minutter = {4: [4, 5, 6, 7, 8, 9, 10, 11]};
@@ -225,22 +282,8 @@
     };
     $.fritteli.uhr.register('dk', layout);
 }(jQuery));
-
-/*
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
 (function($) {
+    'use strict';
     var it_is = {1: [1, 2, 4, 5]};
     var half = {4: [1, 2, 3, 4]};
     var to = {4: [10, 11]};
@@ -306,22 +349,8 @@
     };
     $.fritteli.uhr.register('en', layout);
 }(jQuery));
-
-/*
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
 (function($) {
+    'use strict';
     var es_la = {1: [1, 2, 6, 7]};
     var son_las = {1: [2, 3, 4, 6, 7, 8]};
     var y = {7: [6]};
@@ -387,21 +416,8 @@
     $.fritteli.uhr.register('es', layout);
 }(jQuery));
 
-/*
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
 (function($) {
+    'use strict';
     var il_est = {1: [1, 2, 4, 5, 6]};
     var et = {8: [1, 2]};
     var moins = {7: [1, 2, 3, 4, 5]};
@@ -501,22 +517,8 @@
     };
     $.fritteli.uhr.register('fr', layout);
 }(jQuery));
-
-/*
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
 (function($) {
+    'use strict';
     var sono_le = {1: [1, 2, 3, 4, 6, 7]};
     var e_l = {2: [1, 3, 4]};
     var e = {8: [1]};
@@ -581,22 +583,8 @@
     };
     $.fritteli.uhr.register('it', layout);
 }(jQuery));
-
-/*
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
 (function($) {
+    'use strict';
     var het_is = {1: [1, 2, 3, 5, 6]};
     var over1 = {3: [1, 2, 3, 4]};
     var voor1 = {2: [8, 9, 10, 11]};
@@ -662,22 +650,8 @@
     };
     $.fritteli.uhr.register('nl', layout);
 }(jQuery));
-
-/*
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
 (function ($) {
+    'use strict';
     var e_ = {1: [1]};
     var sao = {1: [2, 3, 4]};
     var e1 = {7: [8]};

_old/dist/jquery.uhr.langs.js

@@ -1,20 +1,8 @@
-'use strict';
+/*! uhr - v8.0.4-dev.0 - 2016-06-27
-
+* http://bärneruhr.ch/
-/*
+* Copyright (c) 2016 Manuel Friedli; Licensed GPL-3.0 */
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
 (function($) {
+    'use strict';
     var es_ist = {1: [1, 2, 4, 5, 6]};
     var uhr = {10: [9, 10, 11]};
     var nach = {4: [8, 9, 10, 11]};
@@ -73,22 +61,8 @@
     };
     $.fritteli.uhr.register('de', layout);
 }(jQuery));
-
-/*
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
 (function($) {
+    'use strict';
 // hilfsvariablen
     var es_isch = {1: [1, 2, 4, 5, 6, 7]};
     var ab = {4: [1, 2]};
@@ -170,22 +144,8 @@
 // Das Layout bei der Uhr unter dem Code "de_CH" registrieren.
     $.fritteli.uhr.register('de_CH', layout);
 }(jQuery));
-
-/*
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
 (function($) {
+    'use strict';
     var es_isch = {1: [1, 2, 4, 5, 6, 7]};
     var genau = {3: [7, 8, 9, 10, 11]};
     var ab = {4: [4, 5]};
@@ -242,7 +202,6 @@
     };
     $.fritteli.uhr.register('de_CH_genau', layout);
 }(jQuery));
-
 /*
  This program is free software: you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
@@ -258,6 +217,7 @@
  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 (function($) {
+    'use strict';
 
     var klokken_er = {1: [1, 2, 3, 4, 5, 6, 7, 9, 10]};
     var minutter = {4: [4, 5, 6, 7, 8, 9, 10, 11]};
@@ -322,22 +282,8 @@
     };
     $.fritteli.uhr.register('dk', layout);
 }(jQuery));
-
-/*
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
 (function($) {
+    'use strict';
     var it_is = {1: [1, 2, 4, 5]};
     var half = {4: [1, 2, 3, 4]};
     var to = {4: [10, 11]};
@@ -403,22 +349,8 @@
     };
     $.fritteli.uhr.register('en', layout);
 }(jQuery));
-
-/*
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
 (function($) {
+    'use strict';
     var es_la = {1: [1, 2, 6, 7]};
     var son_las = {1: [2, 3, 4, 6, 7, 8]};
     var y = {7: [6]};
@@ -484,21 +416,8 @@
     $.fritteli.uhr.register('es', layout);
 }(jQuery));
 
-/*
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
 (function($) {
+    'use strict';
     var il_est = {1: [1, 2, 4, 5, 6]};
     var et = {8: [1, 2]};
     var moins = {7: [1, 2, 3, 4, 5]};
@@ -598,22 +517,8 @@
     };
     $.fritteli.uhr.register('fr', layout);
 }(jQuery));
-
-/*
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
 (function($) {
+    'use strict';
     var sono_le = {1: [1, 2, 3, 4, 6, 7]};
     var e_l = {2: [1, 3, 4]};
     var e = {8: [1]};
@@ -678,22 +583,8 @@
     };
     $.fritteli.uhr.register('it', layout);
 }(jQuery));
-
-/*
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
 (function($) {
+    'use strict';
     var het_is = {1: [1, 2, 3, 5, 6]};
     var over1 = {3: [1, 2, 3, 4]};
     var voor1 = {2: [8, 9, 10, 11]};
@@ -759,22 +650,8 @@
     };
     $.fritteli.uhr.register('nl', layout);
 }(jQuery));
-
-/*
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
 (function ($) {
+    'use strict';
     var e_ = {1: [1]};
     var sao = {1: [2, 3, 4]};
     var e1 = {7: [8]};

_old/dist/uhr-black.min.css

@@ -0,0 +1 @@
+.black .onoffswitch-inner:before,.uhr.black{background-color:#111}.uhr.black .dot:not(.active){border-color:rgba(255,255,255,.1);box-shadow:0 0 .1em rgba(255,255,255,.1)}.uhr.black .letter:not(.active){color:rgba(255,255,255,.1);text-shadow:0 0 .1em rgba(255,255,255,.1)}

_old/dist/uhr-blue.min.css

@@ -0,0 +1 @@
+.blue .onoffswitch-inner:before,.uhr.blue{background-color:#00a}.uhr.blue .dot:not(.active){border-color:rgba(255,255,255,.1);box-shadow:0 0 .1em rgba(255,255,255,.1)}.uhr.blue .letter:not(.active){color:rgba(255,255,255,.1);text-shadow:0 0 .1em rgba(255,255,255,.1)}

_old/dist/uhr-pink.min.css

@@ -0,0 +1 @@
+.pink .onoffswitch-inner:before,.uhr.pink{background-color:#f0a}.uhr.pink .dot.active{border-color:#fff;box-shadow:0 0 .1em #fff}.uhr.pink .letter.active{color:#fff;text-shadow:0 0 .1em #fff}.uhr.pink .dot:not(.active){border-color:rgba(255,255,255,.1);box-shadow:0 0 .1em rgba(255,255,255,.1)}.uhr.pink .letter:not(.active){color:rgba(255,255,255,.1);text-shadow:0 0 .1em rgba(255,255,255,.1)}

_old/dist/uhr-red.min.css

@@ -0,0 +1 @@
+.red .onoffswitch-inner:before,.uhr.red{background-color:#700}.uhr.red .dot:not(.active){border-color:rgba(255,255,255,.1);box-shadow:0 0 .1em rgba(255,255,255,.1)}.uhr.red .letter:not(.active){color:rgba(255,255,255,.1);text-shadow:0 0 .1em rgba(255,255,255,.1)}

_old/dist/uhr-white.min.css

@@ -0,0 +1 @@
+.uhr.white,.white .onoffswitch-inner:before{background-color:#ccc}.uhr.white .dot.active{border-color:#fff;box-shadow:0 0 .1em #fff}.uhr.white .letter.active{color:#fff;text-shadow:0 0 .1em #fff}.uhr.white .dot:not(.active){border-color:rgba(0,0,0,.1);box-shadow:0 0 .1em rgba(0,0,0,.1)}.uhr.white .letter:not(.active){color:rgba(0,0,0,.1);text-shadow:0 0 .1em rgba(0,0,0,.1)}

_old/dist/uhr-yellow.min.css

@@ -0,0 +1 @@
+.uhr.yellow,.yellow .onoffswitch-inner:before{background-color:#fd0}.uhr.yellow .dot.active{border-color:#fff;box-shadow:0 0 .1em #fff}.uhr.yellow .letter.active{color:#fff;text-shadow:0 0 .1em #fff}.uhr.yellow .dot:not(.active){border-color:rgba(0,0,0,.05);box-shadow:0 0 .1em rgba(0,0,0,.05)}.uhr.yellow .letter:not(.active){color:rgba(0,0,0,.05);text-shadow:0 0 .1em rgba(0,0,0,.05)}

_old/dist/uhr.min.css

@@ -0,0 +1 @@
+@font-face{font-family:Uhrenfont;src:url(../resources/uhr.woff) format('woff')}body{font-family:Uhrenfont,sans-serif}.uhr{position:relative;margin:0;transition:background-color .5s}.dot,.uhr .letterarea,.uhr .reflection{position:absolute;display:block}.uhr .reflection{top:0;bottom:0;left:0;right:0;background:radial-gradient(225em 45em at 160% 0,rgba(255,255,255,.4) 0,rgba(255,255,255,.05) 40%,rgba(255,255,255,0) 40%) no-repeat;margin:.15em}.uhr .letterarea{top:12%;bottom:12%;left:12%;right:12%;overflow:hidden;font-size:200%}.dot1,.dot2{top:3.75%}.dot3,.dot4{bottom:3.75%}.dot2,.dot3{right:3.75%}.item{transition:box-shadow .5s,text-shadow .5s,border-color .5s,color .5s}.dot{height:0;width:0;border:.2em solid;border-radius:1em}.dot.active{border-color:#eee;box-shadow:0 0 .2em #eee}.dot1{left:3.75%}.dot4{left:3.75%}.letter{height:10%;width:9.0909%;padding:0;margin:0;display:inline-block;text-align:center;line-height:160%}.letter.active{color:#eee;text-shadow:0 0 .2em #eee}.onoffswitch{position:relative;width:86px;margin:1em;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none}.onoffswitch-checkbox{display:none}.onoffswitch-label{display:block;overflow:hidden;cursor:pointer;border:2px solid #999;border-radius:50px}.modeswitch-inner,.onoffswitch-inner{width:200%;margin-left:-100%;-moz-transition:margin .3s ease-in 0s;-webkit-transition:margin .3s ease-in 0s;-o-transition:margin .3s ease-in 0s;transition:margin .3s ease-in 0s}.modeswitch-inner:after,.modeswitch-inner:before,.onoffswitch-inner:after,.onoffswitch-inner:before{float:left;width:50%;height:24px;padding:0;line-height:24px;font-size:18px;font-weight:700;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;box-sizing:border-box}.onoffswitch-inner:before{content:"EIN";padding-left:12px;color:#eee;transition:background-color .5s}.onoffswitch-inner:after{content:"AUS";padding-right:12px;background-color:#eee;color:#999;text-align:right}.onoffswitch-switch{width:30px;margin:-3px;background:#fff;border:2px solid #999;border-radius:50px;position:absolute;top:0;bottom:0;right:58px;-moz-transition:all .3s ease-in 0s;-webkit-transition:all .3s ease-in 0s;-o-transition:all .3s ease-in 0s;transition:all .3s ease-in 0s}a.uhr-closecontrolpanel,a.uhr-configlink{cursor:pointer;display:inline-block;width:24px;height:24px}.onoffswitch-checkbox:checked+.onoffswitch-label .modeswitch-inner,.onoffswitch-checkbox:checked+.onoffswitch-label .onoffswitch-inner{margin-left:0}.onoffswitch-checkbox:checked+.onoffswitch-label .onoffswitch-switch{right:0}.modeswitch-inner:before{content:"MIN";padding-left:12px;background-color:#fff;color:#000}.modeswitch-inner:after{content:"SEC";padding-right:12px;background-color:#fff;color:#000;text-align:right}a.uhr-configlink{background:url(../resources/settings.png) no-repeat;margin:2px;vertical-align:top}.uhr-controlpanel{border-radius:.5em;box-shadow:0 0 1em #000;background-color:#fff;display:inline-block;padding:.5em;position:sticky;bottom:0;margin-left:1em}.uhr-controlpanel .content{position:relative}a.uhr-closecontrolpanel{position:absolute;right:0;top:-1em;background:url(../resources/close.png) no-repeat}#disclaimer{font-size:.5em}#disclaimer a{color:#444;text-decoration:underline}

_old/index.html

@@ -29,7 +29,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     <link rel="stylesheet" type="text/css" href="dist/uhr-green.min.css" data-class="green" data-name="Grün"/>
     <link rel="stylesheet" type="text/css" href="dist/uhr-blue.min.css" data-class="blue" data-name="Blau"/>
     <link rel="stylesheet" type="text/css" href="dist/uhr-pink.min.css" data-class="pink" data-name="Pink"/>
-    <link rel="shortcut icon" type="image/png" href="resources/favicon.png"/>
+    <link rel="shortcut icon" type="image/png" href="../src/favicon.png"/>
     <link rel="apple-touch-icon-precomposed" href="resources/apple-touch-icon-precomposed.png"/>
     <script type="text/javascript" src="dist/libs.min.js"></script>
     <script type="text/javascript" src="dist/jquery.uhr.complete.min.js"></script>

_old/info/index.html

@@ -22,7 +22,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     <link rel="stylesheet" type="text/css" href="../dist/uhr-black.min.css" data-class="black"/>
     <link rel="stylesheet" type="text/css" href="../dist/uhr-red.min.css" data-class="red"/>
     <link rel="stylesheet" type="text/css" href="info.css"/>
-    <link rel="shortcut icon" type="image/png" href="../resources/favicon.png"/>
+    <link rel="shortcut icon" type="image/png" href="../../src/favicon.png"/>
     <script type="text/javascript" src="../dist/libs.min.js"></script>
     <script type="text/javascript" src="../dist/jquery.uhr.base.min.js"></script>
     <script type="text/javascript">
@@ -289,7 +289,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 <p>Der Quellcode ist frei zugänglich unter <a
     href="https://gittr.ch/manuel/uhr">https://gittr.ch/manuel/uhr</a>.</p>
 
-<p>Detaillierte Informationen zur Verwendung und Konfiguration findest du in der <a href="../README.md">README.md</a>.
+<p>Detaillierte Informationen zur Verwendung und Konfiguration findest du in der <a href="../../README.md">README.md</a>.
 </p>
 
 <h2 id="license">Lizenzbestimmungen<a href="#toc" class="toclink">Zum Inhalt</a></h2>

_old/package.json

@@ -0,0 +1,54 @@
+{
+  "name": "uhr",
+  "version": "8.0.4-dev.0",
+  "description": "jQuery QLOCKTWO plugin",
+  "keywords": [
+    "jquery-plugin",
+    "qlocktwo"
+  ],
+  "scripts": {
+    "ng": "ng"
+  },
+  "homepage": "http://bärneruhr.ch/",
+  "author": {
+    "name": "Manuel Friedli",
+    "email": "manuel@fritteli.ch",
+    "url": "http://www.fritteli.ch/"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://gittr.ch/manuel/uhr"
+  },
+  "licenses": [
+    {
+      "type": "GPL-3.0"
+    }
+  ],
+  "license": "GPL-3.0",
+  "dependencies": {
+    "jquery": "~2.1.3",
+    "jquery-ui": "github:jquery/jquery-ui#1.11.4",
+    "jquery.cookie": "~1.4.1"
+  },
+  "devDependencies": {
+    "@angular/cli": "^1.5.0",
+    "grunt": "~0.4.5",
+    "grunt-cli": "^0.1.13",
+    "grunt-contrib-clean": "~0.6.0",
+    "grunt-contrib-concat": "~0.5.0",
+    "grunt-contrib-connect": "~0.11.0",
+    "grunt-contrib-cssmin": "^0.14.0",
+    "grunt-contrib-jshint": "~0.11.0",
+    "grunt-contrib-qunit": "~0.7.0",
+    "grunt-contrib-uglify": "~0.9.2",
+    "grunt-contrib-watch": "~0.6.1",
+    "grunt-mocha-phantomjs": "^2.0.0",
+    "grunt-version": "^1.0.0",
+    "jshint-stylish": "~2.0.1",
+    "load-grunt-tasks": "~3.3.0",
+    "phantomjs": "^1.9.18",
+    "time-grunt": "~1.2.1",
+    "mocha": "~2.3.3",
+    "chai": "~3.3.0"
+  }
+}

_old/src/uhr-dk.js

@@ -1,3 +1,7 @@
+/*
+ * Copyright (C) Schweizerische Bundesbahnen SBB, 2014.
+ */
+
 /*
  This program is free software: you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by

_old/test/fastforward.html

@@ -29,7 +29,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     <link rel="stylesheet" type="text/css" href="../dist/uhr-green.min.css" data-class="green" data-name="Grün"/>
     <link rel="stylesheet" type="text/css" href="../dist/uhr-blue.min.css" data-class="blue" data-name="Blau"/>
     <link rel="stylesheet" type="text/css" href="../dist/uhr-pink.min.css" data-class="pink" data-name="Pink"/>
-    <link rel="shortcut icon" type="image/png" href="../resources/favicon.png"/>
+    <link rel="shortcut icon" type="image/png" href="../../src/favicon.png"/>
     <link rel="apple-touch-icon-precomposed" href="../resources/apple-touch-icon-precomposed.png"/>
     <script type="text/javascript" src="../dist/libs.min.js"></script>
     <script type="text/javascript" src="../dist/jquery.uhr.complete.min.js"></script>

_old/test/test.js

@@ -8,13 +8,6 @@ suite('Bärneruhr', function () {
         elem = $('#u');
     });
 
-    function cleanupCookies(id) {
-        $.removeCookie('uhr-language' + id);
-        $.removeCookie('uhr-mode' + id);
-        $.removeCookie('uhr-status' + id);
-        $.removeCookie('uhr-theme' + id);
-    }
-
     teardown(function () {
         var uhr = elem.uhr('instance');
         if (uhr !== undefined) {
@@ -28,6 +21,13 @@ suite('Bärneruhr', function () {
         window.location.hash = '';
     });
 
+    function cleanupCookies(id) {
+        $.removeCookie('uhr-language' + id);
+        $.removeCookie('uhr-mode' + id);
+        $.removeCookie('uhr-status' + id);
+        $.removeCookie('uhr-theme' + id);
+    }
+
     test('create and destroy widget', function () {
         var uhr = elem.uhr('instance');
         var id;
@@ -95,10 +95,8 @@ suite('Bärneruhr', function () {
             language: 'klingon'
         });
         uhr = elem.uhr('instance');
-        // The 'uhr' element must be created, and a fall-back language must have been selected
+        // NB: 'de' is just the first language that is included in the page. that may change!
-        assert.isTrue(!!uhr);
+        assert.equal(uhr.options.language, 'de');
-        assert.isTrue(!!uhr.options.language);
-        assert.notEqual(uhr.options.language, 'klingon');
     });
 
     test('unknown theme', function () {

build-config/entrypoints/css-app.js

@@ -1 +0,0 @@
-import '../../css/uhr.css';

build-config/entrypoints/css-black.js

@@ -1 +0,0 @@
-import '../../css/uhr-black.css';

build-config/entrypoints/css-blue.js

@@ -1 +0,0 @@
-import '../../css/uhr-blue.css';

build-config/entrypoints/css-green.js

@@ -1 +0,0 @@
-import '../../css/uhr-green.css';

build-config/entrypoints/css-pink.js

@@ -1 +0,0 @@
-import '../../css/uhr-pink.css';

build-config/entrypoints/css-red.js

@@ -1 +0,0 @@
-import '../../css/uhr-red.css';

build-config/entrypoints/css-white.js

@@ -1 +0,0 @@
-import '../../css/uhr-white.css';

build-config/entrypoints/css-yellow.js

@@ -1 +0,0 @@
-import '../../css/uhr-yellow.css';

build-config/entrypoints/js-app.js

@@ -1 +0,0 @@
-import '../../src/uhr';

build-config/entrypoints/js-base.js

@@ -1,2 +0,0 @@
-import '../../src/uhr';
-import '../../src/uhr-de_CH';

build-config/entrypoints/js-baselangs.js

@@ -1,9 +0,0 @@
-import '../../src/uhr-de';
-import '../../src/uhr-de_CH_genau';
-import '../../src/uhr-dk';
-import '../../src/uhr-en';
-import '../../src/uhr-es';
-import '../../src/uhr-fr';
-import '../../src/uhr-it';
-import '../../src/uhr-nl';
-import '../../src/uhr-pt';

build-config/entrypoints/js-complete.js

@@ -1,11 +0,0 @@
-import '../../src/uhr';
-import '../../src/uhr-de';
-import '../../src/uhr-de_CH';
-import '../../src/uhr-de_CH_genau';
-import '../../src/uhr-dk';
-import '../../src/uhr-en';
-import '../../src/uhr-es';
-import '../../src/uhr-fr';
-import '../../src/uhr-it';
-import '../../src/uhr-nl';
-import '../../src/uhr-pt';

build-config/entrypoints/js-langs.js

@@ -1,10 +0,0 @@
-import '../../src/uhr-de';
-import '../../src/uhr-de_CH';
-import '../../src/uhr-de_CH_genau';
-import '../../src/uhr-dk';
-import '../../src/uhr-en';
-import '../../src/uhr-es';
-import '../../src/uhr-fr';
-import '../../src/uhr-it';
-import '../../src/uhr-nl';
-import '../../src/uhr-pt';

build-config/entrypoints/js-libs.js

@@ -1,3 +0,0 @@
-import 'jquery';
-import 'jquery-ui';
-import 'jquery.cookie';

build-config/rollup.config.css-app.js

@@ -1,11 +0,0 @@
-import cssbundle from 'rollup-plugin-css-bundle';
-import postcss from "postcss";
-import cssnano from "cssnano";
-
-export default {
-    input: 'build-config/entrypoints/css-app.js',
-    plugins: [cssbundle({
-        transform: code => postcss([cssnano]).process(code),
-        output: 'dist/uhr.min.css'
-    })]
-}

build-config/rollup.config.css-black.js

@@ -1,11 +0,0 @@
-import cssbundle from 'rollup-plugin-css-bundle';
-import postcss from 'postcss';
-import cssnano from 'cssnano';
-
-export default {
-    input: 'build-config/entrypoints/css-black.js',
-    plugins: [cssbundle({
-        transform: code => postcss([cssnano]).process(code),
-        output: 'dist/uhr-black.min.css'
-    })]
-}

build-config/rollup.config.css-blue.js

@@ -1,11 +0,0 @@
-import cssbundle from 'rollup-plugin-css-bundle';
-import postcss from 'postcss';
-import cssnano from 'cssnano';
-
-export default {
-    input: 'build-config/entrypoints/css-blue.js',
-    plugins: [cssbundle({
-        transform: code => postcss([cssnano]).process(code),
-        output: 'dist/uhr-blue.min.css'
-    })]
-}

build-config/rollup.config.css-green.js

@@ -1,11 +0,0 @@
-import cssbundle from 'rollup-plugin-css-bundle';
-import postcss from 'postcss';
-import cssnano from 'cssnano';
-
-export default {
-    input: 'build-config/entrypoints/css-green.js',
-    plugins: [cssbundle({
-        transform: code => postcss([cssnano]).process(code),
-        output: 'dist/uhr-green.min.css'
-    })]
-}

build-config/rollup.config.css-pink.js

@@ -1,11 +0,0 @@
-import cssbundle from 'rollup-plugin-css-bundle';
-import postcss from 'postcss';
-import cssnano from 'cssnano';
-
-export default {
-    input: 'build-config/entrypoints/css-pink.js',
-    plugins: [cssbundle({
-        transform: code => postcss([cssnano]).process(code),
-        output: 'dist/uhr-pink.min.css'
-    })]
-}

build-config/rollup.config.css-red.js

@@ -1,11 +0,0 @@
-import cssbundle from 'rollup-plugin-css-bundle';
-import postcss from 'postcss';
-import cssnano from 'cssnano';
-
-export default {
-    input: 'build-config/entrypoints/css-red.js',
-    plugins: [cssbundle({
-        transform: code => postcss([cssnano]).process(code),
-        output: 'dist/uhr-red.min.css'
-    })]
-}

build-config/rollup.config.css-white.js

@@ -1,11 +0,0 @@
-import cssbundle from 'rollup-plugin-css-bundle';
-import postcss from 'postcss';
-import cssnano from 'cssnano';
-
-export default {
-    input: 'build-config/entrypoints/css-white.js',
-    plugins: [cssbundle({
-        transform: code => postcss([cssnano]).process(code),
-        output: 'dist/uhr-white.min.css'
-    })]
-}

build-config/rollup.config.css-yellow.js

@@ -1,11 +0,0 @@
-import cssbundle from 'rollup-plugin-css-bundle';
-import postcss from 'postcss';
-import cssnano from 'cssnano';
-
-export default {
-    input: 'build-config/entrypoints/css-yellow.js',
-    plugins: [cssbundle({
-        transform: code => postcss([cssnano]).process(code),
-        output: 'dist/uhr-yellow.min.css'
-    })]
-}

build-config/rollup.config.js-app.js

@@ -1,23 +0,0 @@
-import {terser} from 'rollup-plugin-terser';
-
-export default {
-    external: [
-        'jquery',
-        'jquery-ui',
-        'jquery.cookie'
-    ],
-    input: 'build-config/entrypoints/js-app.js',
-    output: [
-        {
-            dir: 'dist',
-            entryFileNames: 'jquery.uhr.main.js',
-            format: 'cjs'
-        },
-        {
-            dir: 'dist',
-            entryFileNames: 'jquery.uhr.main.min.js',
-            format: 'cjs',
-            plugins: [terser()]
-        }
-    ]
-}

build-config/rollup.config.js-base.js

@@ -1,23 +0,0 @@
-import {terser} from 'rollup-plugin-terser';
-
-export default {
-    external: [
-        'jquery',
-        'jquery-ui',
-        'jquery.cookie'
-    ],
-    input: 'build-config/entrypoints/js-base.js',
-    output: [
-        {
-            dir: 'dist',
-            entryFileNames: 'jquery.uhr.base.js',
-            format: 'cjs'
-        },
-        {
-            dir: 'dist',
-            entryFileNames: 'jquery.uhr.base.min.js',
-            format: 'cjs',
-            plugins: [terser()]
-        }
-    ]
-}

build-config/rollup.config.js-baselangs.js

@@ -1,23 +0,0 @@
-import {terser} from 'rollup-plugin-terser';
-
-export default {
-    external: [
-        'jquery',
-        'jquery-ui',
-        'jquery.cookie'
-    ],
-    input: 'build-config/entrypoints/js-baselangs.js',
-    output: [
-        {
-            dir: 'dist',
-            entryFileNames: 'jquery.uhr.baselangs.js',
-            format: 'cjs'
-        },
-        {
-            dir: 'dist',
-            entryFileNames: 'jquery.uhr.baselangs.min.js',
-            format: 'cjs',
-            plugins: [terser()]
-        }
-    ]
-}

build-config/rollup.config.js-complete.js

@@ -1,23 +0,0 @@
-import {terser} from 'rollup-plugin-terser';
-
-export default {
-    external: [
-        'jquery',
-        'jquery-ui',
-        'jquery.cookie'
-    ],
-    input: 'build-config/entrypoints/js-complete.js',
-    output: [
-        {
-            dir: 'dist',
-            entryFileNames: 'jquery.uhr.complete.js',
-            format: 'cjs'
-        },
-        {
-            dir: 'dist',
-            entryFileNames: 'jquery.uhr.complete.min.js',
-            format: 'cjs',
-            plugins: [terser()]
-        }
-    ]
-}

build-config/rollup.config.js-langs.js

@@ -1,23 +0,0 @@
-import {terser} from 'rollup-plugin-terser';
-
-export default {
-    external: [
-        'jquery',
-        'jquery-ui',
-        'jquery.cookie'
-    ],
-    input: 'build-config/entrypoints/js-langs.js',
-    output: [
-        {
-            dir: 'dist',
-            entryFileNames: 'jquery.uhr.langs.js',
-            format: 'cjs'
-        },
-        {
-            dir: 'dist',
-            entryFileNames: 'jquery.uhr.langs.min.js',
-            format: 'cjs',
-            plugins: [terser()]
-        }
-    ]
-}

build-config/rollup.config.js-libs.js

@@ -1,21 +0,0 @@
-import {terser} from 'rollup-plugin-terser';
-import {nodeResolve} from '@rollup/plugin-node-resolve';
-
-export default {
-    input: 'build-config/entrypoints/js-libs.js',
-    output: [
-        {
-            dir: 'dist',
-            entryFileNames: 'libs.js',
-            format: 'cjs'
-        },
-        {
-            dir: 'dist',
-            entryFileNames: 'libs.min.js',
-            format: 'cjs',
-            plugins: [terser()]
-        }
-    ],
-    context: 'this',
-    plugins: [nodeResolve()]
-}

dist/uhr-black.min.css

@@ -1 +0,0 @@
-.black .onoffswitch-inner:before,.uhr.black{background-color:#111}.uhr.black .dot:not(.active){border-color:hsla(0,0%,100%,.1);box-shadow:0 0 .1em hsla(0,0%,100%,.1)}.uhr.black .letter:not(.active){color:hsla(0,0%,100%,.1);text-shadow:0 0 .1em hsla(0,0%,100%,.1)}

dist/uhr-blue.min.css

@@ -1 +0,0 @@
-.blue .onoffswitch-inner:before,.uhr.blue{background-color:#00a}.uhr.blue .dot:not(.active){border-color:hsla(0,0%,100%,.1);box-shadow:0 0 .1em hsla(0,0%,100%,.1)}.uhr.blue .letter:not(.active){color:hsla(0,0%,100%,.1);text-shadow:0 0 .1em hsla(0,0%,100%,.1)}