flammarion 0.0.6 → 0.0.7

data/lib/flammarion/version.rb

@@ -1,3 +1,3 @@
 module Flammarion
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

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

@@ -185,16 +185,27 @@ void 0===c?d&&"get"in d&&null!==(e=d.get(a,b))?e:(e=n.find.attr(a,b),null==e?voi
 (function() {
   $.extend(WSClient.prototype.actions, {
     append: function(data) {
-      var atBottom, element, marginSize;
+      var atBottom, atBottomStack, element, marginSize, results;
       this.__parent.check_target(data);
       element = $("#console-" + data.target);
       marginSize = 16;
-      atBottom = element.scrollTop() >= element[0].scrollHeight - element.height() - marginSize - 2 || element[0].scrollHeight - marginSize < element.height();
-      console.log("top: " + (element.scrollTop()) + " height: " + (element[0].scrollHeight - element.height() - marginSize) + " marginSize: " + marginSize + " atBottom: " + atBottom);
+      atBottomStack = [];
+      while (element.hasClass("pane")) {
+        atBottom = element.scrollTop() >= element[0].scrollHeight - element.height() - marginSize - 2 || element[0].scrollHeight - marginSize < element.height();
+        atBottomStack.push(atBottom);
+        element = element.parent();
+      }
+      element = $("#console-" + data.target);
       element.append(this.__parent.escape(data.text, data));
-      if (atBottom) {
-        return element.scrollTop(element[0].scrollHeight - element.height() - marginSize);
+      results = [];
+      while (element.hasClass("pane")) {
+        atBottom = atBottomStack.pop();
+        if (atBottom) {
+          element.scrollTop(element[0].scrollHeight - element.height() - marginSize);
+        }
+        results.push(element = element.parent());
       }
+      return results;
     },
     replace: function(data) {
       this.__parent.check_target(data);
@@ -339,7 +350,10 @@ void 0===c?d&&"get"in d&&null!==(e=d.get(a,b))?e:(e=n.find.attr(a,b),null==e?voi
               if (data.keep_label) {
                 replaceText = "" + data.label + replaceText;
               }
-              return element.replaceWith(replaceText);
+              element.replaceWith(replaceText);
+            }
+            if (data.autoclear) {
+              return element[0].value = "";
             }
           }
         };

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

@@ -6806,16 +6806,27 @@ if (typeof module !== 'undefined') {
 (function() {
   $.extend(WSClient.prototype.actions, {
     append: function(data) {
-      var atBottom, element, marginSize;
+      var atBottom, atBottomStack, element, marginSize, results;
       this.__parent.check_target(data);
       element = $("#console-" + data.target);
       marginSize = 16;
-      atBottom = element.scrollTop() >= element[0].scrollHeight - element.height() - marginSize - 2 || element[0].scrollHeight - marginSize < element.height();
-      console.log("top: " + (element.scrollTop()) + " height: " + (element[0].scrollHeight - element.height() - marginSize) + " marginSize: " + marginSize + " atBottom: " + atBottom);
+      atBottomStack = [];
+      while (element.hasClass("pane")) {
+        atBottom = element.scrollTop() >= element[0].scrollHeight - element.height() - marginSize - 2 || element[0].scrollHeight - marginSize < element.height();
+        atBottomStack.push(atBottom);
+        element = element.parent();
+      }
+      element = $("#console-" + data.target);
       element.append(this.__parent.escape(data.text, data));
-      if (atBottom) {
-        return element.scrollTop(element[0].scrollHeight - element.height() - marginSize);
+      results = [];
+      while (element.hasClass("pane")) {
+        atBottom = atBottomStack.pop();
+        if (atBottom) {
+          element.scrollTop(element[0].scrollHeight - element.height() - marginSize);
+        }
+        results.push(element = element.parent());
       }
+      return results;
     },
     replace: function(data) {
       this.__parent.check_target(data);
@@ -6960,7 +6971,10 @@ if (typeof module !== 'undefined') {
               if (data.keep_label) {
                 replaceText = "" + data.label + replaceText;
               }
-              return element.replaceWith(replaceText);
+              element.replaceWith(replaceText);
+            }
+            if (data.autoclear) {
+              return element[0].value = "";
             }
           }
         };

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

@@ -4,10 +4,20 @@ $.extend WSClient.prototype.actions,
     @__parent.check_target(data)
     element = $("#console-#{data.target}")
     marginSize = 16
-    atBottom = element.scrollTop() >= element[0].scrollHeight - element.height() - marginSize - 2 or element[0].scrollHeight - marginSize < element.height()
-    console.log "top: #{element.scrollTop()} height: #{element[0].scrollHeight - element.height() - marginSize} marginSize: #{marginSize} atBottom: #{atBottom}"
+
+    atBottomStack = []
+    while element.hasClass("pane")
+      atBottom = element.scrollTop() >= element[0].scrollHeight - element.height() - marginSize - 2 or element[0].scrollHeight - marginSize < element.height()
+      atBottomStack.push atBottom
+      element = element.parent()
+
+    element = $("#console-#{data.target}")
     element.append(@__parent.escape(data.text, data))
-    element.scrollTop(element[0].scrollHeight - element.height() - marginSize) if atBottom
+
+    while element.hasClass("pane")
+      atBottom = atBottomStack.pop()
+      element.scrollTop(element[0].scrollHeight - element.height() - marginSize) if atBottom
+      element = element.parent()
 
   replace: (data) ->
     @__parent.check_target(data)
@@ -124,6 +134,8 @@ $.extend WSClient.prototype.actions,
           replaceText = @__parent.escape("#{element[0].value}\n")
           replaceText = "#{data.label}#{replaceText}" if data.keep_label
           element.replaceWith(replaceText)
+        if data.autoclear
+          element[0].value = ""
 
     target.append(element)
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flammarion
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -155,7 +155,8 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '3.3'
-description: An easy to use gui toolkit for Ruby
+description: The nifty Ruby gui toolkit. An easy to use gui toolkit built with scripting
+  in mind.
 email: zach.geek@gmail.com
 executables: []
 extensions: []