maglove 2.0.8 → 2.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bda73faf8f3fe97f7f7ed94374ccfe14ef7096d8
-  data.tar.gz: 4e7f532e6662320a32709cb4332f0e3ca4c4751d
+  metadata.gz: bb9a74c6d12317c688511fe427f1db0983bf6a77
+  data.tar.gz: b403b95686753d58e9637e0ae561003f1da3fad1
 SHA512:
-  metadata.gz: 440ecafc205e2581df3bf50e77fffeb3d0b94619b7ca1e95d965ad1e464af7395bef8c7130cfd0f3529f152d4e16f366c57836c24fbc671aa7616bc0450414a4
-  data.tar.gz: fe92a2b72815731c87df85ee0e80a9b9e63d00b2afdd9f02e0abab5ac104cae25486281bae6d8360f0cbb7a0b84428a373603a708be399f34ed89e4c69deec15
+  metadata.gz: d4e362c92484ef2a6f9ed9208312994ee04d1b084a46fb5d911955153d45ac37ebfc8aec1e05c84dd589b39869f837faccff88e6cfbb9285940c75dd079c67a9
+  data.tar.gz: fb3aae4209b275aee756d9f9fc675b8abd430208ccb68cbcffe271553658de037f38aa8890edf39ed1e35cf99721aec5037c51e67f0afd3d392564247a698be9

data/assets/maglove.haml

@@ -5,21 +5,15 @@
     %title= "#{theme} - #{template}"
     %meta{ name: "viewport", content: "width=device-width, initial-scale=1.0" }
     %meta{ name: "pageid", content: "0" }
+    %link{ href: "/fonts/fonts.css", media: "screen", rel: "stylesheet" }
+    %link{ href: "/maglove.css", media: "screen", rel: "stylesheet" }
     %style{ type: "text/css", id: "theme-css" }
       = css_contents
-    %link{ href: "/fonts/fonts.css", media: "screen", rel: "stylesheet" }
     %script{ type: "text/javascript", id: "theme-js" }
       = js_contents
-    %script{ src: "/maglove.js", type: "text/javascript" }
-    -# %script{ src: "/maglove-widgets.js", type: "text/javascript" }
-    %link{ href: "/maglove.css", media: "screen", rel: "stylesheet" }
-    %link{ href: "/maglove-widgets.css", media: "screen", rel: "stylesheet" }
     %script{ type: "module" }
       :plain
-        import widgets from './maglove-widgets.js'
-        widgets.ready().then(() => {
-          widgets.mount(document.querySelector('page-widget'))
-        })
-        new MagLove("#{template}", "127.0.0.1", "#{port}")      
+        import MagLove from './maglove.js'
+        window.maglove = new MagLove("#{template}", "127.0.0.1", #{port})
   %body
     = contents

data/assets/maglove.js

@@ -1,5 +1,7 @@
-class MagLove {
-  
+import widgets from './maglove-widgets.js'
+window.widgets = widgets
+
+export default class MagLove {
   constructor(template, host="127.0.0.1", port="3000", endpoint="maglove") {
     this.template = template
     this.templates = []
@@ -14,26 +16,26 @@ class MagLove {
     this.socket.onmessage = this.onSocketMessage.bind(this)
     this.socket.onclose = this.onSocketClose.bind(this)
   }
-  
+
   onSocketOpen(event) {
     console.log("MagLove Opened")
     this.send("init")
   }
-  
+
   onSocketMessage(event) {
     const message = JSON.parse(event.data)
     this[message.command](message)
   }
-  
+
   onSocketClose(event) {
     console.log("MagLove Closed")
   }
-  
+
   send(command, data={}) {
     data.command = command
     this.socket.send(JSON.stringify(data))
   }
-  
+
   init(message) {
     console.log("MagLove Initialized")
     this.templates = message.templates
@@ -41,31 +43,37 @@ class MagLove {
     if(window.ThemeApi) {
       window.ThemeApi.init({deviceId: 'AAAAAAAA-BBBB-CCCC-DDDD-EEEEEEEEEEEE', appId: 'com.magloft.maglove', apiHost: 'www.magloft.com'})
     }
+    this.mount()
   }
-  
+
   html(message) {
+    console.log("html")
     if(message.template === this.template) {
       document.body.innerHTML = message.contents
     }
     if (window.$) {
       $(window.document).trigger("typeloftWidgetChanged")
     }
-    if (window.riot) {
-      riot.mount("*")
-    }
+    this.mount()
+  }
+
+  mount() {
+    widgets.ready().then(() => {
+      widgets.mount(document.querySelector('page-widget'))
+    })
   }
-  
+
   css(message) {
     document.getElementById("theme-css").textContent = message.contents
   }
-  
+
   js(message) {
     document.getElementById("theme-js").remove()
     let script = document.createElement('script')
     script.id = "theme-js"
     script.textContent = message.contents
     document.getElementsByTagName('head')[0].appendChild(script)
-    
+
     if(window.ThemeApi) {
       window.ThemeApi.init({deviceId: 'AAAAAAAA-BBBB-CCCC-DDDD-EEEEEEEEEEEE', appId: 'com.magloft.maglove', apiHost: 'www.magloft.com'})
     }

data/lib/maglove/middleware/live_reload.rb

@@ -77,7 +77,7 @@ module MagLove
               elsif filename =~ %r{^src/themes/#{@theme}/.*\.coffee}
                 path = "theme.coffee"
               elsif filename =~ %r{^src/themes/#{@theme}/.*\.js}
-                path = "theme.coffee"
+                path = "theme.js"
               elsif filename =~ %r{^src/themes/#{@theme}/blocks/.*\.haml}
                 path = "templates/#{current_template}.haml"
               else

data/lib/maglove/version.rb

@@ -1,3 +1,3 @@
 module MagLove
-  VERSION = "2.0.8"
+  VERSION = "2.0.9"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: maglove
 version: !ruby/object:Gem::Version
-  version: 2.0.8
+  version: 2.0.9
 platform: ruby
 authors:
 - Tobias Strebitzer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-17 00:00:00.000000000 Z
+date: 2018-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler