flammarion 0.1.10pre2 → 0.1.11

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

@@ -16,7 +16,6 @@ void 0===c?d&&"get"in d&&null!==(e=d.get(a,b))?e:(e=n.find.attr(a,b),null==e?voi
     function StatusDisplay(ws, target) {
       this.ws = ws;
       this.target = target;
-      console.log("Setting up status bar at " + this.target);
       this.target.click((function(_this) {
         return function() {
           return _this.show_history();
@@ -26,8 +25,7 @@ void 0===c?d&&"get"in d&&null!==(e=d.get(a,b))?e:(e=n.find.attr(a,b),null==e?voi
 
     StatusDisplay.prototype.show_status = function(data) {
       this.target.html(this.ws.escape(data.text, data));
-      this.status_history.push(data);
-      return console.log(this.status_history);
+      return this.status_history.push(data);
     };
 
     StatusDisplay.prototype.show_history = function() {
@@ -88,13 +86,20 @@ return"undefined"!=typeof b&&""!==b&&b in a.jsEscapeMap?(d=a.jsEscapeMap[b],e=a.
       };
       this.ws.onmessage = (function(_this) {
         return function(msg) {
-          var data;
-          console.log(msg);
-          data = $.parseJSON(msg.data);
-          if (_this.actions[data.action]) {
-            return _this.actions[data.action](data);
-          } else {
-            return console.error("No such action: " + data.action);
+          var data, error;
+          _this.lastMessage = msg;
+          try {
+            data = $.parseJSON(msg.data);
+            if (_this.actions[data.action]) {
+              return _this.actions[data.action](data);
+            } else {
+              console.log(msg);
+              return console.error("No such action: " + data.action);
+            }
+          } catch (_error) {
+            error = _error;
+            console.log(msg);
+            return console.error(error);
           }
         };
       })(this);
@@ -251,7 +256,6 @@ return"undefined"!=typeof b&&""!==b&&b in a.jsEscapeMap?(d=a.jsEscapeMap[b],e=a.
       if (data.left_icon) {
         if ((":" + data.left_icon + ":") in emojione.emojioneList) {
           left_icon = "<i class='label-icon-left'>" + emojione.shortnameToImage(":" + data.left_icon + ":") + "</i>";
-          console.log(left_icon);
         } else {
           left_icon = "<i class='fa fa-" + data.left_icon + " label-icon-left'></i>";
         }
@@ -390,7 +394,6 @@ return"undefined"!=typeof b&&""!==b&&b in a.jsEscapeMap?(d=a.jsEscapeMap[b],e=a.
             all_boxes = $('.inline-checkbox');
             start = all_boxes.index(_this.__lastChecked);
             stop = all_boxes.index(element);
-            console.log(start, stop);
             all_boxes.slice(Math.min(start, stop), Math.max(start, stop) + 1).find('input').prop("checked", _this.__lastChecked.find('input').prop("checked"));
             return all_boxes.change();
           } else {
@@ -404,7 +407,6 @@ return"undefined"!=typeof b&&""!==b&&b in a.jsEscapeMap?(d=a.jsEscapeMap[b],e=a.
       var element, item, j, k, len, option, ref, ref1, target, v;
       target = this.__parent.check_target(data);
       element = $("<select class='inline-dropdown' name='" + data.id + "'></select>");
-      console.log(data.options);
       if (data.options instanceof Array) {
         ref = data.options;
         for (j = 0, len = ref.length; j < len; j++) {

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

@@ -16,7 +16,6 @@ void 0===c?d&&"get"in d&&null!==(e=d.get(a,b))?e:(e=n.find.attr(a,b),null==e?voi
     function StatusDisplay(ws, target) {
       this.ws = ws;
       this.target = target;
-      console.log("Setting up status bar at " + this.target);
       this.target.click((function(_this) {
         return function() {
           return _this.show_history();
@@ -26,8 +25,7 @@ void 0===c?d&&"get"in d&&null!==(e=d.get(a,b))?e:(e=n.find.attr(a,b),null==e?voi
 
     StatusDisplay.prototype.show_status = function(data) {
       this.target.html(this.ws.escape(data.text, data));
-      this.status_history.push(data);
-      return console.log(this.status_history);
+      return this.status_history.push(data);
     };
 
     StatusDisplay.prototype.show_history = function() {
@@ -88,13 +86,20 @@ return"undefined"!=typeof b&&""!==b&&b in a.jsEscapeMap?(d=a.jsEscapeMap[b],e=a.
       };
       this.ws.onmessage = (function(_this) {
         return function(msg) {
-          var data;
-          console.log(msg);
-          data = $.parseJSON(msg.data);
-          if (_this.actions[data.action]) {
-            return _this.actions[data.action](data);
-          } else {
-            return console.error("No such action: " + data.action);
+          var data, error;
+          _this.lastMessage = msg;
+          try {
+            data = $.parseJSON(msg.data);
+            if (_this.actions[data.action]) {
+              return _this.actions[data.action](data);
+            } else {
+              console.log(msg);
+              return console.error("No such action: " + data.action);
+            }
+          } catch (_error) {
+            error = _error;
+            console.log(msg);
+            return console.error(error);
           }
         };
       })(this);

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

@@ -11,7 +11,6 @@
     function StatusDisplay(ws, target) {
       this.ws = ws;
       this.target = target;
-      console.log("Setting up status bar at " + this.target);
       this.target.click((function(_this) {
         return function() {
           return _this.show_history();
@@ -21,8 +20,7 @@
 
     StatusDisplay.prototype.show_status = function(data) {
       this.target.html(this.ws.escape(data.text, data));
-      this.status_history.push(data);
-      return console.log(this.status_history);
+      return this.status_history.push(data);
     };
 
     StatusDisplay.prototype.show_history = function() {

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

@@ -16,7 +16,6 @@ void 0===c?d&&"get"in d&&null!==(e=d.get(a,b))?e:(e=n.find.attr(a,b),null==e?voi
     function StatusDisplay(ws, target) {
       this.ws = ws;
       this.target = target;
-      console.log("Setting up status bar at " + this.target);
       this.target.click((function(_this) {
         return function() {
           return _this.show_history();
@@ -26,8 +25,7 @@ void 0===c?d&&"get"in d&&null!==(e=d.get(a,b))?e:(e=n.find.attr(a,b),null==e?voi
 
     StatusDisplay.prototype.show_status = function(data) {
       this.target.html(this.ws.escape(data.text, data));
-      this.status_history.push(data);
-      return console.log(this.status_history);
+      return this.status_history.push(data);
     };
 
     StatusDisplay.prototype.show_history = function() {
@@ -88,13 +86,20 @@ return"undefined"!=typeof b&&""!==b&&b in a.jsEscapeMap?(d=a.jsEscapeMap[b],e=a.
       };
       this.ws.onmessage = (function(_this) {
         return function(msg) {
-          var data;
-          console.log(msg);
-          data = $.parseJSON(msg.data);
-          if (_this.actions[data.action]) {
-            return _this.actions[data.action](data);
-          } else {
-            return console.error("No such action: " + data.action);
+          var data, error;
+          _this.lastMessage = msg;
+          try {
+            data = $.parseJSON(msg.data);
+            if (_this.actions[data.action]) {
+              return _this.actions[data.action](data);
+            } else {
+              console.log(msg);
+              return console.error("No such action: " + data.action);
+            }
+          } catch (_error) {
+            error = _error;
+            console.log(msg);
+            return console.error(error);
           }
         };
       })(this);

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

@@ -3476,6 +3476,7 @@ hr {
   color: rgba(71,76,81,0.75);
 }
 ::-webkit-scrollbar {
+  font-size: 14px;
   width: 0.666em;
   height: 0.666em;
 }

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

@@ -1,4 +1,5 @@
 ::-webkit-scrollbar {
+  font-size: 14px;
   width: 0.666em;
   height: 0.666em;
 }

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

@@ -0,0 +1,12 @@
+#= require websocket.coffee
+if window.$remote
+  $.extend WSClient.prototype.actions,
+    snapshot: (data) ->
+      window.$remote.getCurrentWindow().capturePage (image) =>
+        @__parent.send({
+          id:data.id
+          action:'callback'
+          source:'snapshot'
+          data: image.toPNG()
+          original_msg:data
+          })

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

@@ -8,7 +8,6 @@ $.extend WSClient.prototype.actions,
     if data.left_icon
       if ":#{data.left_icon}:" of emojione.emojioneList
         left_icon = "<i class='label-icon-left'>" + emojione.shortnameToImage(":#{data.left_icon}:") + "</i>"
-        console.log left_icon
       else
         left_icon = "<i class='fa fa-#{data.left_icon} label-icon-left'></i>"
 
@@ -110,7 +109,6 @@ $.extend WSClient.prototype.actions,
         all_boxes = $('.inline-checkbox')
         start = all_boxes.index(@__lastChecked)
         stop = all_boxes.index(element)
-        console.log start, stop
 
         all_boxes.slice(Math.min(start, stop), Math.max(start, stop) + 1).find('input').prop("checked", @__lastChecked.find('input').prop("checked"))
         all_boxes.change()
@@ -121,7 +119,6 @@ $.extend WSClient.prototype.actions,
   dropdown: (data) ->
     target = @__parent.check_target(data)
     element = $("<select class='inline-dropdown' name='#{data.id}'></select>")
-    console.log data.options
     if data.options instanceof Array
       element.append($("<option>#{item}</option>")) for item in data.options
     else

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

@@ -3,14 +3,12 @@ class StatusDisplay
   waiting_statuses: []
   max_statuses: 10
   constructor: (@ws, @target) ->
-    console.log("Setting up status bar at #{@target}")
     @target.click =>
       @show_history()
 
   show_status: (data) ->
     @target.html(@ws.escape(data.text, data))
     @status_history.push data
-    console.log(@status_history)
 
   show_history: ->
     console.log(@status_history)

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

@@ -19,12 +19,18 @@ class WSClient
       $('body').removeClass("connected")
 
     @ws.onmessage = (msg) =>
-      console.log(msg)
-      data = $.parseJSON(msg.data)
-      if @actions[data.action]
-        @actions[data.action](data)
-      else
-        console.error("No such action: #{data.action}")
+      # Just keeping this around for debug purposes
+      @lastMessage = msg
+      try
+        data = $.parseJSON(msg.data)
+        if @actions[data.action]
+          @actions[data.action](data)
+        else
+          console.log msg
+          console.error("No such action: #{data.action}")
+      catch error
+        console.log msg
+        console.error error
 
     @status = new StatusDisplay(this, $('#status > .right'))
 

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

@@ -2,6 +2,7 @@
 @import 'mixins.styl'
 
 ::-webkit-scrollbar {
+  font-size: $default-font-size;
   width: 0.666em;
   height: 0.666em;
 }

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: flammarion
 version: !ruby/object:Gem::Version
-  version: 0.1.10pre2
-  prerelease: 6
+  version: 0.1.11
+  prerelease: 
 platform: ruby
 authors:
 - Zach Capalbo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-09 00:00:00.000000000 Z
+date: 2016-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubame
@@ -1991,6 +1991,7 @@ files:
 - lib/html/source/javascripts/vendor/highlight.pack.js
 - lib/html/source/javascripts/vendor/plotly.min.js
 - lib/html/source/javascripts/websocket.coffee
+- lib/html/source/javascripts/electron_extensions.coffee
 - lib/html/source/javascripts/plot.coffee
 - lib/html/source/javascripts/searchbar.coffee
 - lib/html/source/javascripts/input.coffee
@@ -3774,6 +3775,7 @@ files:
 - lib/html/build/javascripts/plot.js
 - lib/html/build/javascripts/websocket.js
 - lib/html/build/javascripts/all.js
+- lib/html/build/javascripts/electron_extensions.js
 - lib/html/build/javascripts/vendor/l.control.geosearch.js
 - lib/html/build/javascripts/vendor/emojione.js
 - lib/html/build/javascripts/vendor/l.geosearch.provider.openstreetmap.js
@@ -3850,9 +3852,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23