concerto_frontend 0.0.7 → 0.0.8

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: f65cf04d31e7fed72c83744426525bab20032ffd
4
- data.tar.gz: 06967ea3aea9fd359da26312f33b73ccdd2e104b
3
+ metadata.gz: 7253a46cab748d2ae62902131f8a9fc7edb84ef7
4
+ data.tar.gz: 87ea11b37296836c78e4071d2a53dd5ff85023a1
5
5
  SHA512:
6
- metadata.gz: ec8bce681971954a9a0dd2f626addf46478a92437df0ba122375f6dde2f88d8da79484d5303a3b2aec561ed901ccaa369869aad3014aaec8fd6589ffef1145e4
7
- data.tar.gz: 23e9de948db4b4f43a85bbd53ca81d3ef21d84f4450bae6c8e6ed4f2904658c057b577f7f518ea5a95d2e926e47b30d377d7d2bd5772221685c6a36f8a91c5a6
6
+ metadata.gz: 4ea63f2eba7ec351487309a23b135903b7e523dcf5f2f766e66880b3fc5df8792d288441884e2d9bf50a1f064d17b0f23e7a4dec5b265322e22a523173b901e8
7
+ data.tar.gz: 37ec84c726b3b4b4f58ae467f5dd8bd4792a2d15c3048a536977f5d8105f125123ebfcd18dfc77f1546890071eee472eaf67987e4d8aa904372de2160c9fde6a
@@ -8542,10 +8542,23 @@ if (!window.Promise) {
8542
8542
  *
8543
8543
  */
8544
8544
  attached: function() {
8545
- if (this.config["time_format"]) {
8546
- var datetime = moment().tz(this.timezone).format(this.config["time_format"]);
8545
+ var datetime;
8546
+ if (this.timezone != "null") {
8547
+ // screen time zone is specified
8548
+ if (this.config["time_format"]) {
8549
+ // screen has customized date/time format in field config
8550
+ datetime = moment().tz(this.timezone).format(this.config["time_format"]);
8551
+ } else {
8552
+ datetime = moment().tz(this.timezone).format("MM/DD/YY <br/> hh:mm A");
8553
+ }
8547
8554
  } else {
8548
- var datetime = moment().tz(this.timezone).format("MM/DD/YY <br/> hh:mm A");
8555
+ // screen has no time zone set
8556
+ if (this.config["time_format"]) {
8557
+ // screen has customized date/time format in field config
8558
+ datetime = moment().format(this.config["time_format"]);
8559
+ } else {
8560
+ datetime = moment().format("MM/DD/YY <br/> hh:mm A");
8561
+ }
8549
8562
  }
8550
8563
 
8551
8564
  this.$.clientTime.innerHTML = datetime;
@@ -1,3 +1,3 @@
1
1
  module ConcertoFrontend
2
- VERSION = "0.0.7"
2
+ VERSION = "0.0.8"
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: concerto_frontend
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.7
4
+ version: 0.0.8
5
5
  platform: ruby
6
6
  authors:
7
7
  - Gabriel Perez
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2015-09-10 00:00:00.000000000 Z
11
+ date: 2015-09-11 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rails