diff options
| author | marudor <marudor@marudor.de> | 2018-02-08 23:01:43 +0100 |
|---|---|---|
| committer | marudor <marudor@marudor.de> | 2018-02-08 23:01:43 +0100 |
| commit | 757d87946931620cf5fe84ec5f163edd6f3986f8 (patch) | |
| tree | 224336e2b108c375842c4d10dd22bc927040073a | |
| parent | 71b41847e6247471abb957b5859605d9f92fb77e (diff) | |
changes based on igels review
| -rw-r--r-- | js/moment-countdown.js | 14 | ||||
| -rw-r--r-- | js/vendor.js | 16 | ||||
| -rw-r--r-- | src/Database/Db.php | 1 | ||||
| -rw-r--r-- | templates/layout.html | 2 |
4 files changed, 17 insertions, 16 deletions
diff --git a/js/moment-countdown.js b/js/moment-countdown.js new file mode 100644 index 00000000..78bf3f9d --- /dev/null +++ b/js/moment-countdown.js @@ -0,0 +1,14 @@ +$(document).ready(function () { + if (typeof moment !== "undefined") { + $.each($(".moment-countdown"), function (i, e) { + var span = $(e); + var text = span.html(); + /* global moment */ + var timestamp = moment(parseInt(span.attr("data-timestamp") * 1000)); + span.html(text.replace("%c", timestamp.fromNow())); + setInterval(function () { + span.html(text.replace("%c", timestamp.fromNow())); + }, 1000); + }); + } +});
\ No newline at end of file diff --git a/js/vendor.js b/js/vendor.js index 5857efb1..7fb51099 100644 --- a/js/vendor.js +++ b/js/vendor.js @@ -10,22 +10,10 @@ import 'imports-loader?this=>window&define=>false&exports=>false!moment/locale/d import './forms'; import './sticky-headers'; import 'icomoon/style.css'; +import './moment-countdown'; $(function () { moment.locale("%locale%"); }); -$(document).ready(function () { - if (typeof moment !== "undefined") { - $.each($(".moment-countdown"), function (i, e) { - var span = $(e); - var text = span.html(); - /* global moment */ - var timestamp = moment(parseInt(span.attr("data-timestamp") * 1000)); - span.html(text.replace("%c", timestamp.fromNow())); - setInterval(function () { - span.html(text.replace("%c", timestamp.fromNow())); - }, 1000); - }); - } -}); + diff --git a/src/Database/Db.php b/src/Database/Db.php index 50fba7e7..114bd8fc 100644 --- a/src/Database/Db.php +++ b/src/Database/Db.php @@ -31,7 +31,6 @@ class Db try { self::$db = new PDO($dsn, $username, $password, $options); } catch (PDOException $e) { - var_dump($e); return false; } diff --git a/templates/layout.html b/templates/layout.html index 3a56a2a5..3ec6decc 100644 --- a/templates/layout.html +++ b/templates/layout.html @@ -38,7 +38,7 @@ · <a href="https://github.com/engelsystem/engelsystem/issues">Bugs / Features</a> · <a href="https://github.com/engelsystem/engelsystem/">Development Platform</a> · <a href="%credits_url%">Credits</a> - </div>; + </div> </div> </div> </div> |