concerto_frontend 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f65cf04d31e7fed72c83744426525bab20032ffd
-  data.tar.gz: 06967ea3aea9fd359da26312f33b73ccdd2e104b
+  metadata.gz: 7253a46cab748d2ae62902131f8a9fc7edb84ef7
+  data.tar.gz: 87ea11b37296836c78e4071d2a53dd5ff85023a1
 SHA512:
-  metadata.gz: ec8bce681971954a9a0dd2f626addf46478a92437df0ba122375f6dde2f88d8da79484d5303a3b2aec561ed901ccaa369869aad3014aaec8fd6589ffef1145e4
-  data.tar.gz: 23e9de948db4b4f43a85bbd53ca81d3ef21d84f4450bae6c8e6ed4f2904658c057b577f7f518ea5a95d2e926e47b30d377d7d2bd5772221685c6a36f8a91c5a6
+  metadata.gz: 4ea63f2eba7ec351487309a23b135903b7e523dcf5f2f766e66880b3fc5df8792d288441884e2d9bf50a1f064d17b0f23e7a4dec5b265322e22a523173b901e8
+  data.tar.gz: 37ec84c726b3b4b4f58ae467f5dd8bd4792a2d15c3048a536977f5d8105f125123ebfcd18dfc77f1546890071eee472eaf67987e4d8aa904372de2160c9fde6a

data/app/views/concerto_frontend/_frontend.html

@@ -8542,10 +8542,23 @@ if (!window.Promise) {
        *
        */
       attached: function() {
-        if (this.config["time_format"]) {          
-          var datetime = moment().tz(this.timezone).format(this.config["time_format"]);
+        var datetime;
+        if (this.timezone != "null") {
+          // screen time zone is specified 
+          if (this.config["time_format"]) { 
+            // screen has customized date/time format in field config         
+            datetime = moment().tz(this.timezone).format(this.config["time_format"]);
+          } else {
+            datetime = moment().tz(this.timezone).format("MM/DD/YY <br/> hh:mm A");
+          }
         } else {
-          var datetime = moment().tz(this.timezone).format("MM/DD/YY <br/> hh:mm A");
+          // screen has no time zone set 
+          if (this.config["time_format"]) {  
+            // screen has customized date/time format in field config          
+            datetime = moment().format(this.config["time_format"]);
+          } else {
+            datetime = moment().format("MM/DD/YY <br/> hh:mm A");
+          }
         }
 
         this.$.clientTime.innerHTML = datetime;

data/lib/concerto_frontend/version.rb

@@ -1,3 +1,3 @@
 module ConcertoFrontend
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: concerto_frontend
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Gabriel Perez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-10 00:00:00.000000000 Z
+date: 2015-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails