flammarion 0.0.11 → 0.0.12

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

@@ -110,28 +110,41 @@ void 0===c?d&&"get"in d&&null!==(e=d.get(a,b))?e:(e=n.find.attr(a,b),null==e?voi
     };
 
     WSClient.prototype.resize_panes = function(data) {
-      var allPanes, height, i, len, orientation, pane, results, target;
+      var allPanes, i, j, len, orientation, p_height, pane, results, target, total_weight;
       if (data.target) {
         target = this.check_target(data);
       } else {
         target = $('#panes');
       }
       allPanes = target.find('> .pane');
-      height = (100.0 / allPanes.size()).toFixed(0) + "%";
       if (target.hasClass('horizontal')) {
         orientation = 'horizontal';
       } else {
         orientation = 'vertical';
       }
-      console.log(target, allPanes.size(), 100.0 / allPanes.size(), height, orientation);
+      total_weight = ((function() {
+        var j, len, results;
+        results = [];
+        for (j = 0, len = allPanes.length; j < len; j++) {
+          i = allPanes[j];
+          results.push(parseFloat($(i).attr('pane-weight') || 1.0));
+        }
+        return results;
+      })()).reduce(function(t, s) {
+        return t + s;
+      });
+      p_height = function(pane) {
+        return (parseFloat($(pane).attr('pane-weight') || 1.0) / total_weight * 100).toFixed(0) + "%";
+      };
+      console.log(target, allPanes.size(), 100.0 / allPanes.size(), total_weight, orientation);
       results = [];
-      for (i = 0, len = allPanes.length; i < len; i++) {
-        pane = allPanes[i];
+      for (j = 0, len = allPanes.length; j < len; j++) {
+        pane = allPanes[j];
         if (orientation === 'horizontal') {
-          $(pane).css("width", height);
+          $(pane).css("width", p_height(pane));
           results.push($(pane).css("height", '100%'));
         } else {
-          $(pane).css("height", height);
+          $(pane).css("height", p_height(pane));
           results.push($(pane).css("width", '100%'));
         }
       }

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

@@ -0,0 +1,28 @@
+(function() {
+  window.show_search_bar = function() {
+    $('#searchbar').show();
+    return $('#searchbar > input').focus();
+  };
+
+  $(document).ready(function() {
+    return $('#searchbar > input').change(function() {
+      var anchor, text;
+      text = $('#searchbar > input')[0].value;
+      $('#searchbar').hide();
+      $('#searchbar > input')[0].value = "";
+      console.log("Searching " + text);
+      if (window.find(text, 0, 0, 1)) {
+        console.log("Found " + text);
+        anchor = window.getSelection().anchorNode;
+        if (anchor.nodeType !== 1) {
+          anchor = anchor.parentNode;
+        }
+        anchor.focus();
+        return anchor.scrollIntoView();
+      } else {
+        return alert("Cannot find " + text);
+      }
+    });
+  });
+
+}).call(this);

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

@@ -110,28 +110,41 @@ void 0===c?d&&"get"in d&&null!==(e=d.get(a,b))?e:(e=n.find.attr(a,b),null==e?voi
     };
 
     WSClient.prototype.resize_panes = function(data) {
-      var allPanes, height, i, len, orientation, pane, results, target;
+      var allPanes, i, j, len, orientation, p_height, pane, results, target, total_weight;
       if (data.target) {
         target = this.check_target(data);
       } else {
         target = $('#panes');
       }
       allPanes = target.find('> .pane');
-      height = (100.0 / allPanes.size()).toFixed(0) + "%";
       if (target.hasClass('horizontal')) {
         orientation = 'horizontal';
       } else {
         orientation = 'vertical';
       }
-      console.log(target, allPanes.size(), 100.0 / allPanes.size(), height, orientation);
+      total_weight = ((function() {
+        var j, len, results;
+        results = [];
+        for (j = 0, len = allPanes.length; j < len; j++) {
+          i = allPanes[j];
+          results.push(parseFloat($(i).attr('pane-weight') || 1.0));
+        }
+        return results;
+      })()).reduce(function(t, s) {
+        return t + s;
+      });
+      p_height = function(pane) {
+        return (parseFloat($(pane).attr('pane-weight') || 1.0) / total_weight * 100).toFixed(0) + "%";
+      };
+      console.log(target, allPanes.size(), 100.0 / allPanes.size(), total_weight, orientation);
       results = [];
-      for (i = 0, len = allPanes.length; i < len; i++) {
-        pane = allPanes[i];
+      for (j = 0, len = allPanes.length; j < len; j++) {
+        pane = allPanes[j];
         if (orientation === 'horizontal') {
-          $(pane).css("width", height);
+          $(pane).css("width", p_height(pane));
           results.push($(pane).css("height", '100%'));
         } else {
-          $(pane).css("height", height);
+          $(pane).css("height", p_height(pane));
           results.push($(pane).css("width", '100%'));
         }
       }

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

@@ -2783,6 +2783,11 @@ html {
   pointer-events: none;
   border: 1px solid #012;
 }
+hr {
+  width: 95%;
+  background-color: #333;
+  border: 1px solid #d6d6d6;
+}
 /* required styles */
 
 
@@ -3289,6 +3294,21 @@ html {
   background: #bebebe;
   box-shadow: inset 0px 0px 1px 1px #d6d6d6;
 }
+#searchbar {
+  position: absolute;
+  right: 10%;
+  top: 0px;
+  padding: 5px;
+  padding-top: 0px;
+  background-color: #eee;
+  border: 1px solid #242424;
+  border-top: 0px;
+  border-radius: 0 0 4px 4px;
+  box-shadow: 2px 2px 4px 2px #bebebe;
+}
+#searchbar > input {
+  margin-left: 1em;
+}
 #status {
   background-color: #aaa;
   margin: 0px;

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

@@ -90,3 +90,8 @@ html {
   pointer-events: none;
   border: 1px solid #012;
 }
+hr {
+  width: 95%;
+  background-color: #333;
+  border: 1px solid #d6d6d6;
+}

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

@@ -0,0 +1,15 @@
+#searchbar {
+  position: absolute;
+  right: 10%;
+  top: 0px;
+  padding: 5px;
+  padding-top: 0px;
+  background-color: #eee;
+  border: 1px solid #242424;
+  border-top: 0px;
+  border-radius: 0 0 4px 4px;
+  box-shadow: 2px 2px 4px 2px #bebebe;
+}
+#searchbar > input {
+  margin-left: 1em;
+}

data/lib/html/source/index.html.slim

@@ -29,4 +29,6 @@ html
       .left
       .center
       .right
-      
+    #searchbar.hidden
+      i.fa.fa-search 
+      input

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

@@ -33,7 +33,10 @@ $.extend WSClient.prototype.actions,
     else
       target = $('#panes')
 
-    target.append("<pre class='pane full-pane' id='console-#{data.name}'><pre>") if target.find("#console-#{data.name}").size() is 0
+    if target.find("#console-#{data.name}").size() is 0
+      element = $("<pre class='pane full-pane' id='console-#{data.name}'><pre>")
+      element.attr('pane-weight', data.weight || 1)
+      target.append(element)
     @__parent.resize_panes(data)
 
   closepane: (data) ->
@@ -80,34 +83,6 @@ $.extend WSClient.prototype.actions,
     @__parent.add(newblock, target, data)
     hljs.highlightBlock(code) for code in newblock.find('code')
 
-  button: (data) ->
-    target = @__parent.check_target(data)
-    class_name = if data.inline then 'inline-button' else 'full-button'
-    left_icon = ""
-    data.right_icon ||= data.icon
-    left_icon = "<i class='fa fa-#{data.left_icon} label-icon-left'></i>" if data.left_icon
-    right_icon = ""
-    right_icon = "<i class='fa fa-#{data.right_icon} label-icon-right'></i>" if data.right_icon
-
-    element = $("<a href='#' class='#{class_name}'>#{left_icon}#{@__parent.escape(data.label, data)}#{right_icon}</a>")
-    element.click =>
-      @__parent.send({
-        id:data.id
-        action:'callback'
-        source:'button'
-        original_msg:data
-        })
-    target.append element
-
-  buttonbox: (data) ->
-    target = @__parent.check_target(data)
-
-    element = target.find("#console-#{data.name}")
-    if element.size() is 0
-      target.prepend("<pre class='button-box' id='console-#{data.name}'></pre>")
-    else
-      element.addClass('button-box')
-
   break: (data) ->
     target = @__parent.check_target(data)
     code = $("<hr>")
@@ -120,77 +95,6 @@ $.extend WSClient.prototype.actions,
       other_classes = "subpane-fill" if data.fill
       target.append("<pre id='console-#{data.name}' class='subpane pane #{other_classes}'></pre>")
 
-  input: (data) ->
-    target = @__parent.check_target(data)
-    if data.multiline
-      element = $("<textarea placeholder='#{data.label}' class='inline-text-input'></textarea>")
-    else
-      element = $("<input type='text' placeholder='#{data.label}' class='inline-text-input'>")
-    if data.value
-      element[0].value = data.value
-
-    element.change =>
-      unless element.hasClass("unclicked")
-        @__parent.send({
-          id:data.id
-          action:'callback'
-          source:'input'
-          text: element[0].value
-          original_msg:data
-          })
-        if data.once
-          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)
-
-    if data.focus
-      element.focus()
-
-  checkbox: (data) ->
-    target = @__parent.check_target(data)
-    element = $("<label class='inline-checkbox'><input type='checkbox'><span>#{@__parent.escape(data.label,data)}</span></label>'")
-    if data.value
-      element.find('input').attr "checked", true
-      element.addClass "checked"
-    element.change (e) =>
-      element.toggleClass("checked",  element.find('input').prop('checked'))
-      @__parent.send({
-        id:data.id
-        action:'callback'
-        source:'input'
-        checked: element.find('input').prop('checked')
-        original_msg:data
-        })
-    element.click (e) =>
-      if e.shiftKey and @__lastChecked
-        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()
-      else
-        @__lastChecked = element
-    target.append(element)
-
-  dropdown: (data) ->
-    target = @__parent.check_target(data)
-    element = $("<select class='inline-dropdown' name='#{data.id}'></select>")
-    element.append($("<option>#{item}</option>")) for item in data.options
-    element.change (e) =>
-      @__parent.send({
-        id:data.id
-        action:'callback'
-        source:'dropdown'
-        text: element.find('option:selected').text()
-        })
-    @__parent.add(element, target, data)
-
   alert: (data) ->
     alert(data.text)
 

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

@@ -0,0 +1,117 @@
+#= require websocket.coffee
+$.extend WSClient.prototype.actions,
+  button: (data) ->
+    target = @__parent.check_target(data)
+    class_name = if data.inline then 'inline-button' else 'full-button'
+    left_icon = ""
+    data.right_icon ||= data.icon
+    left_icon = "<i class='fa fa-#{data.left_icon} label-icon-left'></i>" if data.left_icon
+    right_icon = ""
+    right_icon = "<i class='fa fa-#{data.right_icon} label-icon-right'></i>" if data.right_icon
+
+    element = $("<a href='#' class='#{class_name}'>#{left_icon}#{@__parent.escape(data.label, data)}#{right_icon}</a>")
+    element.click =>
+      @__parent.send({
+        id:data.id
+        action:'callback'
+        source:'button'
+        original_msg:data
+        })
+    target.append element
+
+  buttonbox: (data) ->
+    target = @__parent.check_target(data)
+
+    element = target.find("#console-#{data.name}")
+    if element.size() is 0
+      target.prepend("<pre class='button-box' id='console-#{data.name}'></pre>")
+    else
+      element.addClass('button-box')
+
+  input: (data) ->
+    target = @__parent.check_target(data)
+    if data.multiline
+      element = $("<textarea placeholder='#{data.label}' class='inline-text-input'></textarea>")
+    else
+      element = $("<input type='text' placeholder='#{data.label}' class='inline-text-input'>")
+    if data.value
+      element[0].value = data.value
+
+    element.change =>
+      unless element.hasClass("unclicked")
+        @__parent.send({
+          id:data.id
+          action:'callback'
+          source:'input'
+          text: element[0].value
+          original_msg:data
+          })
+        if data.once
+          replaceText = @__parent.escape("#{element[0].value}\n")
+          replaceText = "#{data.label}#{replaceText}" if data.keep_label
+          element.replaceWith(replaceText)
+        if data.history
+          history = element.data('history') || []
+          history.push element[0].value
+          element.data('history', history)
+          element.data('history-index', history.length)
+        if data.autoclear
+          element[0].value = ""
+
+    offset_history = (e, amt) =>
+      history = element.data('history') || []
+      i = element.data('history-index') + amt
+      e.preventDefault()
+      if i >= 0 and i < history.length
+        element[0].value = history[i]
+        element.data('history-index', i)
+
+    element.keydown (e) =>
+      offset_history(e, -1) if e.which is 38 and data.history
+      offset_history(e, +1) if e.which is 40 and data.history
+
+    target.append(element)
+
+    if data.focus
+      element.focus()
+
+  checkbox: (data) ->
+    target = @__parent.check_target(data)
+    element = $("<label class='inline-checkbox'><input type='checkbox'><span>#{@__parent.escape(data.label,data)}</span></label>'")
+    if data.value
+      element.find('input').attr "checked", true
+      element.addClass "checked"
+    element.change (e) =>
+      element.toggleClass("checked",  element.find('input').prop('checked'))
+      @__parent.send({
+        id:data.id
+        action:'callback'
+        source:'input'
+        checked: element.find('input').prop('checked')
+        original_msg:data
+        })
+    element.click (e) =>
+      if e.shiftKey and @__lastChecked
+        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()
+      else
+        @__lastChecked = element
+    target.append(element)
+
+  dropdown: (data) ->
+    target = @__parent.check_target(data)
+    element = $("<select class='inline-dropdown' name='#{data.id}'></select>")
+    element.append($("<option>#{item}</option>")) for item in data.options
+    element.change (e) =>
+      @__parent.send({
+        id:data.id
+        action:'callback'
+        source:'dropdown'
+        text: element.find('option:selected').text()
+        })
+    @__parent.add(element, target, data)

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

@@ -0,0 +1,19 @@
+window.show_search_bar = ->
+  $('#searchbar').show()
+  $('#searchbar > input').focus()
+
+$(document).ready ->
+  $('#searchbar > input').change ->
+    text = $('#searchbar > input')[0].value
+    $('#searchbar').hide()
+    $('#searchbar > input')[0].value = ""
+    console.log "Searching #{text}"
+    if window.find(text, 0, 0, 1)
+      console.log "Found #{text}"
+      anchor = window.getSelection().anchorNode
+      anchor = anchor.parentNode unless anchor.nodeType == 1
+      anchor.focus()
+      anchor.scrollIntoView()
+    else
+      alert("Cannot find #{text}")
+    # $('#searchbar > input')[0].value = text