Fixed console truncation: closes #8; add log level select to console: c…

…loses #7
tidev · Aug 23, 2017 · 1b4832f · 1b4832f
1 parent 2676642
commit 1b4832f
Show file tree

Hide file tree

Showing 4 changed files with 49 additions and 23 deletions.
diff --git a/lib/appc.js b/lib/appc.js
@@ -111,14 +111,18 @@ export function loadProject() {
 export function buildTi() {
     var selectedPlatform = _toolbar.platformSelect.selectedOption();
     var selectedSimulator = _toolbar.simulatorSelect.selectedOption();
+    var logLevel = _console.logLevelSelect.selectedOption().value;
 
     _toolbar.hud.displayMessage({
         text: 'Building for ' + selectedPlatform.text + '...',
         spinner: true
     });
 
     var options = {
-        args: ['-p', selectedPlatform.value, '-d', atom.project.getPaths()[0], '-C', selectedSimulator.value],
+        args: ['-p', selectedPlatform.value, 
+               '-d', atom.project.getPaths()[0], 
+               '-C', selectedSimulator.value,
+               '-l', logLevel],
         log: function(text){
             _console.write(text);
             if (text.indexOf('built successfully') != -1) {

diff --git a/lib/toolbar/console.js b/lib/toolbar/console.js
@@ -1,5 +1,8 @@
 'use babel';
 
+import Select from './select';
+import Button from './button';
+
 export default class Console {// extends View {
 
     constructor() {
@@ -10,18 +13,26 @@ export default class Console {// extends View {
         this.toolbar.classList.add('console-toolbar');
         this.element.appendChild(this.toolbar);
 
-        var closeButton = document.createElement('button');
-        closeButton.classList.add('console-toolbar-button');
-        var title = document.createTextNode("Close");
-        closeButton.appendChild(title);
-        this.close = this.close.bind(this);
-        closeButton.addEventListener('click', this.close);
-        this.toolbar.appendChild(closeButton);
+        // var closeButton = document.createElement('button');
+        // closeButton.classList.add('console-toolbar-button');
+        // var title = document.createTextNode("Close");
+        // closeButton.appendChild(title);
+        // this.close = this.close.bind(this);
+        // closeButton.addEventListener('click', this.close);
+        // this.toolbar.appendChild(closeButton);
+
+        this.logLevelSelect = new Select({width: '90px'});
+        this.logLevelSelect.addOptions([{text: 'Trace', value: 'trace'},
+                                       {text: 'Debug', value: 'debug'},
+                                       {text: 'Info', value: 'info'},
+                                       {text: 'Warn', value: 'warn'},
+                                       {text: 'Error', value: 'error'}]);
+        this.toolbar.appendChild(this.logLevelSelect.element);
 
         var clearButton = document.createElement('button');
-        clearButton.classList.add('console-toolbar-button');
-        var title = document.createTextNode("Clear");
-        clearButton.appendChild(title);
+        clearButton.classList.add('console-toolbar-button', 'fa', 'fa-lg', 'fa-trash-o');
+        // var title = document.createTextNode("Clear");
+        // clearButton.appendChild(title);
         this.clear = this.clear.bind(this);
         clearButton.addEventListener('click', this.clear);
         this.toolbar.appendChild(clearButton);
@@ -76,7 +87,7 @@ export default class Console {// extends View {
             var textNode = document.createTextNode(text);
             p.appendChild(textNode);
             this.messages.appendChild(p);
-            this.messages.scrollTop = this.messages.scrollHeight;
+            this.messages.scrollTop = this.messages.scrollHeight + 30;
         }
     }
 

diff --git a/lib/toolbar/select.js b/lib/toolbar/select.js
@@ -26,15 +26,20 @@ export default class Select {
         }
     }
 
-    addOption(options) {
-
+    addOption(args) {
         var option = document.createElement('option');
-        option.setAttribute('value', options.value);
-        var text = document.createTextNode(options.text);
+        option.setAttribute('value', args.value);
+        var text = document.createTextNode(args.text);
         option.appendChild(text);
         this.element.appendChild(option);
     }
 
+    addOptions(options) {
+        options.forEach(function(option){
+            this.addOption(option);
+        }.bind(this));
+    }
+
     selectedOption() {
         return this.element.options[this.element.selectedIndex];
     }

diff --git a/styles/appc.less b/styles/appc.less
@@ -106,34 +106,40 @@
 
 .console {
     height: 100%;
+    padding: 0 0 44px 0; // bottom margin = toolbar height
+    background-color: #000;
     overflow-y: hidden;
 }
 
 .console-toolbar {
     margin: 0;
-    padding: 0;
-    height: 30px;
+    padding: 0 6px;
+    height: 44px;
+    display: flex;
     background-color: @base-background-color;//#222;
     border-top: 1px solid #ac0201;
     border-bottom: 1px solid darken(@base-background-color, 15%);//#111;
 }
 
 .console-toolbar-button {
+    cursor: default;
     background-color: @base-background-color;//#222;
     // color: #ddd;
     border: none;
-    margin: 0 10px 0 0;
+    margin: auto 10px auto 0;
     padding: 0;
-    width: 60px;
-    height: 28px;
+    width: 40px;
+    height: 40px;
 }
 
 .console-messages {
     height: 100%;
-    padding: 0 10px 15px 0;
+    margin: 0 6px;
+    // padding: 0 0 50px 0;
     overflow-y: scroll;
     font-family: monospace;
     user-select: text;
+    // background-color: #dddd00;
 }
 
 p.log {
@@ -158,5 +164,5 @@ p.warn {
 }
 
 p.error {
-    color: #dd0000;
+    color: #ff0000;
 }