Commit graph

manuel/uhr

Fork 0

60e68ffeaf renamed _id to id manuel 2014-07-03 21:18:27 +02:00
ec9b44427c renamed _timer to timer manuel 2014-07-03 21:16:47 +02:00
08cca0a915 helper variables don't need to be wrapped in their own object. manuel 2014-07-03 21:06:06 +02:00
3d0245abfa wrap the layout definitions in immediately executing anonymous functions manuel 2014-07-03 20:37:34 +02:00
85b5670dfc removed the window.uhr global variable! hooray! manuel 2014-07-03 20:33:26 +02:00
5a9ec0e0df basically the whole thing is rewritten :) manuel 2014-07-03 20:10:55 +02:00
7b0e77f16f fixed syntax error. was probably introduced while refactoring manuel 2014-07-03 20:09:01 +02:00
218a0f40e5 fixed the path to the font manuel 2014-07-03 20:06:37 +02:00
09562d47a4 intermediate commit manuel 2014-07-03 18:36:43 +02:00
afe923c136 some JSHint'ing and reorganizing of the project-structure manuel 2014-07-03 16:53:07 +02:00
e316557ac8 added script which should convert normal links into javascript links Manuel Friedli 2014-07-02 19:21:50 +02:00
ab0d78ae18 updated favicon and added favicon.ico Manuel Friedli 2014-06-30 15:56:38 +02:00
cbbe2e103d Merge branch 'develop' into feature/new-splashscreen Manuel Friedli 2014-06-30 15:49:02 +02:00
44345884a7 Merge branch 'develop' into feature/splashscreen Manuel Friedli 2014-06-30 15:48:48 +02:00
f3d8aab61f Merge branch 'develop' into 'master' v6.2.1 Manuel Friedli 2014-06-28 23:46:44 +02:00
340669c5eb fixed 24h bug Manuel Friedli 2014-06-28 23:46:12 +02:00
0fb0551783 Merge branch 'develop' into 'master' v6.2 Manuel Friedli 2014-06-28 23:39:52 +02:00
348177e52a Merge branch 'feature/fix-cookie-path' into 'develop' Manuel Friedli 2014-06-28 23:32:27 +02:00
719a2a8343 update manifest version Manuel Friedli 2014-06-28 23:31:47 +02:00
c890429dd6 consider the path when setting a cookie, but make it overridable with the configuration parameter 'cookiePath'. Manuel Friedli 2014-06-28 23:27:41 +02:00
6047499a18 Merge branch 'develop' into feature/fix-cookie-path Manuel Friedli 2014-06-28 23:16:36 +02:00
9ffc1bec75 Merge branch 'develop' into 'master' v6.1.2 Manuel Friedli 2014-06-28 23:14:32 +02:00
4811367f46 deleted test.html Manuel Friedli 2014-06-28 23:14:09 +02:00
065d9a2853 update manifest version Manuel Friedli 2014-06-28 23:12:54 +02:00
bd3fb48b0d find all stylesheets, not only those defined in the head. Manuel Friedli 2014-06-28 23:12:20 +02:00
9eba4192ed Merge branch 'develop' into feature/fix-cookie-path Manuel Friedli 2014-06-28 23:07:26 +02:00
8a5912af98 Merge branch 'develop' into 'master' v6.1.1 Manuel Friedli 2014-06-28 22:55:37 +02:00
0461411c6a Merge branch 'feature/lang-it' into 'develop' Manuel Friedli 2014-06-28 22:52:12 +02:00
9971763697 added it layout and updated documentation and manifest.appcache Manuel Friedli 2014-06-28 22:50:42 +02:00
ff850fca64 Merge branch 'feature/lang-fr' into 'develop' Manuel Friedli 2014-06-28 22:16:52 +02:00
120574c36b i guess this version deserves a minor-version-bump, not only micro, as _normalizeHours() is gone. Manuel Friedli 2014-06-28 22:14:05 +02:00
e666350b3f updated the documentation Manuel Friedli 2014-06-28 22:12:59 +02:00
a378f45470 activate french in the showcase and update manifest Manuel Friedli 2014-06-28 22:06:15 +02:00
f7defa96d5 added french layout Manuel Friedli 2014-06-28 22:04:24 +02:00
f93083c128 preparing to support languages that make a difference between AM and PM Manuel Friedli 2014-06-28 22:03:35 +02:00
bde19624b2 Merge branch 'develop' into feature/fix-cookie-path Manuel Friedli 2014-06-28 17:04:47 +02:00
75568578f6 deleted commented old stuff Manuel Friedli 2014-06-28 17:04:30 +02:00
07b64480cd Merge branch 'develop' into feature/fix-cookie-path Manuel Friedli 2014-06-28 17:00:30 +02:00
8e7029759a Merge branch 'develop' into feature/new-splashscreen Manuel Friedli 2014-06-28 16:59:40 +02:00
0aa50f1132 Merge branch 'develop' into feature/splashscreen Manuel Friedli 2014-06-28 16:58:13 +02:00
8ba7f1ba0f Merge branch 'feature/splashscreen' of git.friedli.info:manuel/uhr into feature/splashscreen Manuel Friedli 2014-06-28 16:57:38 +02:00
deb8f40080 Merge branch 'develop' into 'master' v6.0 Manuel Friedli 2014-06-28 16:51:57 +02:00
56f20907d9 Merge branch 'feature/refactor-layout-definition' into 'develop' Manuel Friedli 2014-06-28 16:49:07 +02:00
f04d5a9aef remove trailing newline Manuel Friedli 2014-06-28 16:47:44 +02:00
59c5b8d358 updated manifest, including the version Manuel Friedli 2014-06-28 16:44:03 +02:00
bb027261b2 register languages with help of a function. that enables advances functionality with fallback-language and makes it generally more robust. this commit concludes the refactoring of the layout definition. Manuel Friedli 2014-06-28 16:40:24 +02:00
d9ae1f3783 removed unnecessary comma Manuel Friedli 2014-06-28 16:38:12 +02:00
2564eec812 added yellow theme Manuel Friedli 2014-06-28 16:04:06 +02:00
194ebc58de fix sizing Manuel Friedli 2014-06-28 15:58:28 +02:00
480736e877 refactor: move every helper function inside the scope-limiting block in order not to pollute world Manuel Friedli 2014-06-28 15:53:08 +02:00
ffcf8fa2f2 added showcase Manuel Friedli 2014-06-28 15:52:48 +02:00
135a180e12 make cookie path configurable Manuel Friedli 2014-06-28 14:41:30 +02:00
d334101ae0 updated version in manifest.appcache Manuel Friedli 2014-06-28 14:36:46 +02:00
b45b6bcaad use default cookie-path instead of / Manuel Friedli 2014-06-28 14:34:20 +02:00
96507d58a2 Merge branch 'develop' into feature/refactor-layout-definition Manuel Friedli 2014-06-28 14:23:29 +02:00
38ba4bd14b Merge branch 'develop' into feature/new-splashscreen Manuel Friedli 2014-06-28 14:22:49 +02:00
d3e4f67b8b Merge branch 'develop' into feature/splashscreen Manuel Friedli 2014-06-28 14:21:26 +02:00
28b74b30c5 Merge branch 'develop' into 'master' v5.1 Manuel Friedli 2014-06-28 14:20:08 +02:00
66287994ca Merge branch 'feature/css-auto-detect' into 'develop' Manuel Friedli 2014-06-28 14:16:39 +02:00
fd940192f4 fixed (?) markdown Manuel Friedli 2014-06-28 14:13:47 +02:00
7be99ce264 update documentation in README.md and incremented version in manifest.appcache Manuel Friedli 2014-06-28 14:11:44 +02:00
fbf0217719 updated manifest.appcache version Manuel Friedli 2014-06-28 13:58:00 +02:00
4c1ea9e1cd update documentation Manuel Friedli 2014-06-28 13:57:10 +02:00
ee60105130 only include required files Manuel Friedli 2014-06-28 13:56:55 +02:00
448747626c make auto-detection more robust and include a fallback if cookie or config doesn't match available themes Manuel Friedli 2014-06-28 13:56:20 +02:00
ae3da935be only render selectors for language and theme if there is more than one language / theme definition. use the first defined theme as default if not explicitly specified. Manuel Friedli 2014-06-28 12:10:24 +02:00
1bc60d7a1b use data-class and data-name attributes on stylesheets to define styleclass and pretty-name of themes Manuel Friedli 2014-06-28 10:54:28 +02:00
a4a440c8f0 deleted detector.js, it is integrated in uhr.js Manuel Friedli 2014-06-28 02:21:54 +02:00
4360f5aee1 Merge branch 'develop' into feature/new-splashscreen Manuel Friedli 2014-06-28 02:14:50 +02:00
6ef4f36b07 Merge branch 'develop' into feature/splashscreen Manuel Friedli 2014-06-28 02:12:17 +02:00
1a8e268a6a re-ordered head contents Manuel Friedli 2014-06-28 02:09:48 +02:00
38df0a87c9 integrate detection in main file Manuel Friedli 2014-06-28 02:00:34 +02:00
09a53b0883 the order in which JS and CSS files are included MATTERS! autodetection of themes works, as a first draft. Manuel Friedli 2014-06-28 01:04:53 +02:00
455068d069 temporarily include detector.js Manuel Friedli 2014-06-28 00:52:55 +02:00
a72aacb504 first playground parsing the CSS names Manuel Friedli 2014-06-28 00:52:05 +02:00
600b84c36a Merge branch 'develop' into feature/refactor-layout-definition Manuel Friedli 2014-06-27 13:45:24 +02:00
011e4cdf64 updated manifest.appcache Manuel Friedli 2014-06-27 13:44:59 +02:00
32d19fe85e added pink style Manuel Friedli 2014-06-27 13:43:35 +02:00
e5ce0ab2bb cache parsed layouts instead of re-parsing them every time the language changes Manuel Friedli 2014-06-27 13:23:10 +02:00
a263a1f18c fixed hour3 + minutes45 to 49 Manuel Friedli 2014-06-27 13:20:36 +02:00
29b280cf8b removed unnecessary array-brackets Manuel Friedli 2014-06-27 12:56:32 +02:00
fa1c6a1ea3 added comments Manuel Friedli 2014-06-27 12:55:31 +02:00
a9d8888f6a drop support for the old layout. only v2 supported as of now. Manuel Friedli 2014-06-27 12:44:38 +02:00
4942cfda2f deleted obsolete helper methods Manuel Friedli 2014-06-27 12:34:01 +02:00
d4874d1ec2 migrated en to v2 Manuel Friedli 2014-06-27 12:28:19 +02:00
14d7ee79bc bugfix: when explicitly setting the time to a value with the same minute, it didn't get updated. Manuel Friedli 2014-06-27 12:27:43 +02:00
c25a0d6c33 migrating en to v2, first step Manuel Friedli 2014-06-26 16:46:50 +02:00
c1961d7fca migrated de to v2 Manuel Friedli 2014-06-26 16:38:30 +02:00
0c67a41116 fixed bug with minute 49 Manuel Friedli 2014-06-26 16:37:43 +02:00
77ccc95b93 migrated normal de_CH layout to v2 Manuel Friedli 2014-06-26 16:19:56 +02:00
428074b1f8 added missing semicolon Manuel Friedli 2014-06-26 16:19:18 +02:00
8f609294ff renamed _new to _genau Manuel Friedli 2014-06-26 16:06:23 +02:00
57556987ac renamed the helper renderer to _..., as per private naming convention Manuel Friedli 2014-06-26 16:01:42 +02:00
8234d4f3ea deleted unnecessary line Manuel Friedli 2014-06-26 16:01:25 +02:00
b9473f405f moved parsing of v2-layouts to own class Manuel Friedli 2014-06-26 15:52:08 +02:00
6d588aa08b bugfix for update in relation to fixed time; slight change in format of layout definition. Manuel Friedli 2014-06-26 14:41:56 +02:00
f9b6acf8b6 improved handling of explicit time()-setting: no re-rendering, just update the time and call _update(). that avoids flashing of the letters. Manuel Friedli 2014-06-26 14:13:21 +02:00
3e8252fa13 fixed a typo Manuel Friedli 2014-06-26 14:07:31 +02:00
eff9700864 first working version with some bugfixes! refactoring ensues ... Manuel Friedli 2014-06-26 13:46:10 +02:00
9a1160f66e deletes _TEST-file, working with the _new-file from now on. Manuel Friedli 2014-06-26 10:43:15 +02:00