Commit 14a98f3f4ab143923984f36168037ece41c99b76
- Diff rendering mode:
- inline
- side by side
| 1 | diff --git a/usr/lib/luna/system/luna-systemui/app/controllers/bar-assistant.js b/usr/lib/luna/system/luna-systemui/app/controllers/bar-assistant.js | ||
| 2 | index ee479ac..f02e1cd 100644 | ||
| 3 | --- a/usr/lib/luna/system/luna-systemui/app/controllers/bar-assistant.js | ||
| 4 | +++ b/usr/lib/luna/system/luna-systemui/app/controllers/bar-assistant.js | ||
| 5 | @@ -2337,7 +2337,7 @@ updateClockEveryMinute: function() { | ||
| 6 | } | ||
| 7 | } | ||
| 8 | format = format.replace(/\s?a\s?/,""); | ||
| 9 | - $('clock').innerHTML = Mojo.Format.formatDate(date, {time: format}); | ||
| 10 | + $('clock').innerHTML = Mojo.Format.formatDate(date, {date:'short',time: format}); | ||
| 11 | $('today').innerHTML = Mojo.Format.formatDate(date,{date:'short'}); | ||
| 12 | }, | ||
| 13 |
| 1 | diff --git a/usr/lib/luna/system/luna-systemui/app/controllers/bar-assistant.js b/usr/lib/luna/system/luna-systemui/app/controllers/bar-assistant.js | ||
| 2 | index ee479ac..115140c 100644 | ||
| 3 | --- a/usr/lib/luna/system/luna-systemui/app/controllers/bar-assistant.js | ||
| 4 | +++ b/usr/lib/luna/system/luna-systemui/app/controllers/bar-assistant.js | ||
| 5 | @@ -2337,7 +2337,9 @@ updateClockEveryMinute: function() { | ||
| 6 | } | ||
| 7 | } | ||
| 8 | format = format.replace(/\s?a\s?/,""); | ||
| 9 | - $('clock').innerHTML = Mojo.Format.formatDate(date, {time: format}); | ||
| 10 | + var formatDate = Mojo.Format.formatDate(date, {date:'short'}); | ||
| 11 | + formatDate = formatDate.substr(0, formatDate.lastIndexOf('/')); | ||
| 12 | + $('clock').innerHTML = formatDate+' '+Mojo.Format.formatDate(date, {time:format}); | ||
| 13 | $('today').innerHTML = Mojo.Format.formatDate(date,{date:'short'}); | ||
| 14 | }, | ||
| 15 |
| 1 | diff --git a/usr/lib/luna/system/luna-systemui/app/controllers/bar-assistant.js b/usr/lib/luna/system/luna-systemui/app/controllers/bar-assistant.js | ||
| 2 | index ee479ac..115140c 100644 | ||
| 3 | --- a/usr/lib/luna/system/luna-systemui/app/controllers/bar-assistant.js | ||
| 4 | +++ b/usr/lib/luna/system/luna-systemui/app/controllers/bar-assistant.js | ||
| 5 | @@ -2337,7 +2337,9 @@ updateClockEveryMinute: function() { | ||
| 6 | } | ||
| 7 | } | ||
| 8 | format = format.replace(/\s?a\s?/,""); | ||
| 9 | - $('clock').innerHTML = Mojo.Format.formatDate(date, {time: format}); | ||
| 10 | + var formatDate = Mojo.Format.formatDate(date, {date:'short'}); | ||
| 11 | + formatDate = formatDate.substr(0, formatDate.lastIndexOf('/')); | ||
| 12 | + $('clock').innerHTML = formatDate+' '+Mojo.Format.formatDate(date, {time:format}); | ||
| 13 | $('today').innerHTML = Mojo.Format.formatDate(date,{date:'short'}); | ||
| 14 | }, | ||
| 15 |
top-bar/top-bar-add-date.patch
(0 / 13)
| 1 | diff --git a/usr/lib/luna/system/luna-systemui/app/controllers/bar-assistant.js b/usr/lib/luna/system/luna-systemui/app/controllers/bar-assistant.js | ||
| 2 | index ee479ac..f02e1cd 100644 | ||
| 3 | --- a/usr/lib/luna/system/luna-systemui/app/controllers/bar-assistant.js | ||
| 4 | +++ b/usr/lib/luna/system/luna-systemui/app/controllers/bar-assistant.js | ||
| 5 | @@ -2337,7 +2337,7 @@ updateClockEveryMinute: function() { | ||
| 6 | } | ||
| 7 | } | ||
| 8 | format = format.replace(/\s?a\s?/,""); | ||
| 9 | - $('clock').innerHTML = Mojo.Format.formatDate(date, {time: format}); | ||
| 10 | + $('clock').innerHTML = Mojo.Format.formatDate(date, {date:'short',time: format}); | ||
| 11 | $('today').innerHTML = Mojo.Format.formatDate(date,{date:'short'}); | ||
| 12 | }, | ||
| 13 |
