flammarion 0.1.10pre1 → 0.1.10pre2

data/electron/main.coffee

@@ -11,7 +11,8 @@ app.on 'ready', ->
     webPreferences:
       nodeIntegration: false
       webSecurity: false
-    icon:"icon.png"
+      preload:preload
+    icon:path.resolve(path.join(__dirname, "icon.png"))
     preload:preload
   main_window.loadURL(process.argv[2])
   main_window.setMenu(null)

data/electron/main.js

@@ -18,9 +18,10 @@
       height: parseInt(process.argv[4]) || 600,
       webPreferences: {
         nodeIntegration: false,
-        webSecurity: false
+        webSecurity: false,
+        preload: preload
       },
-      icon: "icon.png",
+      icon: path.resolve(path.join(__dirname, "icon.png")),
       preload: preload
     });
     main_window.loadURL(process.argv[2]);

data/electron/preload.coffee

@@ -1,10 +1,12 @@
-window.$remote = require('remote')
-
-webFrame = require('web-frame')
+try
+  window.$remote = require('remote')
+  webFrame = require('web-frame')
+catch error
+  window.$remote = require('electron').remote
+  {webFrame} = require('electron')
 
 try
   spellcheck = require('spellchecker')
-
   webFrame.setSpellCheckProvider("en-US", true, {
     spellCheck: (text) ->
       return !spellcheck.isMisspelled(text)
@@ -15,3 +17,5 @@ catch error
 window.onkeyup = (e) ->
   if e.ctrlKey and e.keyCode is 70
     window.show_search_bar()
+  if e.ctrlKey and e.shiftKey and e.keyCode is 73
+    $remote.getCurrentWindow().toggleDevTools()

data/electron/preload.js

@@ -2,9 +2,14 @@
 (function() {
   var error, spellcheck, webFrame;
 
-  window.$remote = require('remote');
-
-  webFrame = require('web-frame');
+  try {
+    window.$remote = require('remote');
+    webFrame = require('web-frame');
+  } catch (_error) {
+    error = _error;
+    window.$remote = require('electron').remote;
+    webFrame = require('electron').webFrame;
+  }
 
   try {
     spellcheck = require('spellchecker');
@@ -20,7 +25,10 @@
 
   window.onkeyup = function(e) {
     if (e.ctrlKey && e.keyCode === 70) {
-      return window.show_search_bar();
+      window.show_search_bar();
+    }
+    if (e.ctrlKey && e.shiftKey && e.keyCode === 73) {
+      return $remote.getCurrentWindow().toggleDevTools();
     }
   };
 

data/lib/flammarion/version.rb

@@ -1,3 +1,3 @@
   module Flammarion
-    VERSION = "0.1.10pre1"
+    VERSION = "0.1.10pre2"
   end

data/lib/html/build/javascripts/all.js

@@ -7806,12 +7806,20 @@ window.font_awesome_list = ["glass","music","search","envelope-o","heart","star"
           element.append(option);
         }
       }
+      if (data.value) {
+        element.val(data.value);
+      }
       element.change((function(_this) {
         return function(e) {
-          var val;
+          var error, val;
           val = element.find('option:selected').text();
           if (element.find('option:selected')[0].value) {
-            val = $.parseJSON(element.find('option:selected')[0].value);
+            try {
+              val = $.parseJSON(element.find('option:selected')[0].value);
+            } catch (_error) {
+              error = _error;
+              val = element.find('option:selected')[0].value;
+            }
           }
           return _this.__parent.send({
             id: data.id,

data/lib/html/build/javascripts/input.js

@@ -420,12 +420,20 @@ return"undefined"!=typeof b&&""!==b&&b in a.jsEscapeMap?(d=a.jsEscapeMap[b],e=a.
           element.append(option);
         }
       }
+      if (data.value) {
+        element.val(data.value);
+      }
       element.change((function(_this) {
         return function(e) {
-          var val;
+          var error, val;
           val = element.find('option:selected').text();
           if (element.find('option:selected')[0].value) {
-            val = $.parseJSON(element.find('option:selected')[0].value);
+            try {
+              val = $.parseJSON(element.find('option:selected')[0].value);
+            } catch (_error) {
+              error = _error;
+              val = element.find('option:selected')[0].value;
+            }
           }
           return _this.__parent.send({
             id: data.id,

data/lib/html/build/stylesheets/all.css

@@ -621,6 +621,9 @@ Railscasts-like style (c) Visoft, Inc. (Damien White)
 #dialog > #content > .full-button {
   height: 1em;
 }
+#dialog > #content pre {
+  font-family: Menlo, Consolas, monospace;
+}
 
 body {
   background-color: #1d1f21;

data/lib/html/build/stylesheets/dialog.css

@@ -44,3 +44,6 @@
 #dialog > #content > .full-button {
   height: 1em;
 }
+#dialog > #content pre {
+  font-family: Menlo, Consolas, monospace;
+}

data/lib/html/source/javascripts/input.coffee

@@ -129,10 +129,14 @@ $.extend WSClient.prototype.actions,
         option = $("<option>#{k}</option>")
         option.val(JSON.stringify(v))
         element.append(option)
+    element.val(data.value) if data.value
     element.change (e) =>
       val = element.find('option:selected').text()
       if element.find('option:selected')[0].value
-        val = $.parseJSON(element.find('option:selected')[0].value)
+        try
+          val = $.parseJSON(element.find('option:selected')[0].value)
+        catch error
+          val = element.find('option:selected')[0].value
       @__parent.send({
         id:data.id
         action:'callback'

data/lib/html/source/stylesheets/dialog.styl

@@ -30,3 +30,5 @@
       overflow auto
     & > .full-button
       height 1em
+    & pre
+      font-family $main-font

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flammarion
 version: !ruby/object:Gem::Version
-  version: 0.1.10pre1
+  version: 0.1.10pre2
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-06 00:00:00.000000000 Z
+date: 2016-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubame