Merge branch 'release/1.0.0-alpha.5'

Author: paxtonhare

CHANGELOG.md

@@ -1,7 +1,16 @@
 # Change Log
 
-## [Unreleased](https://github.com/paxtonhare/marklogic-debugger/tree/v1.0.0-alpha.4)
+## [v1.0.0-alpha.5](https://github.com/paxtonhare/marklogic-debugger/tree/v1.0.0-alpha.5)
 
+[Full Changelog](https://github.com/paxtonhare/marklogic-debugger/compare/v1.0.0-alpha.4...v1.0.0-alpha.5)
+
+**Closed issues:**
+
+- Add scroll bar to the Console area [\#15](https://github.com/paxtonhare/marklogic-debugger/issues/15)
+- debug area changes height when stepping [\#14](https://github.com/paxtonhare/marklogic-debugger/issues/14)
+- Welcome dialog is showing many times [\#13](https://github.com/paxtonhare/marklogic-debugger/issues/13)
+
+## [v1.0.0-alpha.4](https://github.com/paxtonhare/marklogic-debugger/tree/v1.0.0-alpha.4) (2017-02-10)
 [Full Changelog](https://github.com/paxtonhare/marklogic-debugger/compare/v1.0.0-alpha.3...v1.0.0-alpha.4)
 
 **Closed issues:**

gradle.properties

@@ -1,2 +1,2 @@
-version=1.0.0-alpha.4
+version=1.0.0-alpha.5
 

src/main/ui/app/grid/grid.component.scss

@@ -69,7 +69,7 @@
  $value : #{($i * 5) / 100};
 
  /deep/ .#{$flexName}-#{$i * 5} {
- flex-grow: #{$value};
+ flex: #{$value} 1 0%
  }
  }
 }

src/main/ui/app/home/home.component.html

@@ -16,7 +16,7 @@
  </mdl-layout-header>
  <mdl-layout-content>
  <div gm-grid>
- <div gm-row class="flex flex-80">
+ <div gm-row class="flex flex-70">
  <div gm-col class="flex flex-30 files">
  <template [ngIf]="selectedServer">
  <div class="section-title">
@@ -37,7 +37,7 @@
  <gm-divider></gm-divider>
  <div gm-col class="flex flex-70">
  <div class="fill-height" *ngIf="currentUri">
- <div class="section-title">File View: {{currentUri}} <span>{{currentExpression}}</span></div>
+ <div class="section-title">File View: {{currentUri}}</div>
  <div class="section-body">
  <app-codemirror *ngIf="fileText"
  [ngModel]="fileText"
@@ -53,7 +53,7 @@
  <div gm-divider class="debug-divider">
  <span>Debug Area</span>
  </div>
- <div gm-row class="flex flex-20 debug-area">
+ <div gm-row class="flex flex-30 debug-area">
  <div gm-col class="flex flex-30 debugger">
  <div class="disabled" *ngIf="!requestId">
  <span>DEBUG A REQUEST TO ENABLE</span>
@@ -84,7 +84,7 @@
  <p *ngIf="!hasVariables()">&nbsp;</p>
  </app-subsection>
  <app-subsection [title]="'Console'">
- <div class="console-buttons">
+ <div class="console-buttons" section-header>
  <button md-button (click)="clearConsole()">Clear</button>
  </div>
  <div *ngFor="let output of consoleOutput" class="console-output">

src/main/ui/app/home/home.component.scss

@@ -166,6 +166,13 @@ $hover-color: unquote("rgb(#{$palette-debugger-50})");
  .debugger {
  position: relative;
 
+ .section-body {
+ display: flex;
+ flex: 1;
+ flex-direction: column;
+ overflow-y: scroll;
+ }
+
  .disabled {
  position: absolute;
  top: 0px;
@@ -227,9 +234,11 @@ $hover-color: unquote("rgb(#{$palette-debugger-50})");
 
 ul.frames {
  list-style: none;
- padding: 0px 10px;
+ padding: 0px;
+ margin: 0px;
 
  li {
+ padding: 5px;
  cursor: default;
  &:hover {
  background-color: $hover-color;
@@ -319,7 +328,5 @@ ul.frames {
 }
 
 .console-buttons {
- position: absolute;
- top: 30px;
- right: 10px;
+ float: right;
 }

src/main/ui/app/home/home.component.ts

@@ -39,6 +39,7 @@ export class HomeComponent implements OnInit, OnDestroy {
  consoleOutput: Array<any> = [];
  commandHistory: Array<string> = [];
  commandHistoryIndex: number = -1;
+ welcomeShown: boolean = false;
 
  breakpointsSet: boolean = false;
 
@@ -102,8 +103,9 @@ export class HomeComponent implements OnInit, OnDestroy {
  this.currentUri = null;
  }
 
- if (localStorage.getItem('_show_welcome_') !== 'false') {
+ if (!this.welcomeShown && localStorage.getItem('_show_welcome_') !== 'false') {
  this.showWelcome();
+ this.welcomeShown = true;
  }
 
  },

src/main/ui/app/subsection/subsection.component.html

@@ -1,6 +1,7 @@
-<div class="sub-section">
- <div class="title" (click)="toggleCollapsed()" [ngClass]="{'collapsed' : isCollapsed()}"><mdl-icon>arrow_drop_down</mdl-icon> {{title}}</div>
- <div class="body" *ngIf="!isCollapsed()">
- <ng-content></ng-content>
- </div>
+<div class="title" (click)="toggleCollapsed()" [ngClass]="{'collapsed' : isCollapsed()}">
+ <mdl-icon>arrow_drop_down</mdl-icon> {{title}}
+ <ng-content select="[section-header]"></ng-content>
+</div>
+<div class="body" *ngIf="!isCollapsed()">
+ <ng-content></ng-content>
 </div>

src/main/ui/app/subsection/subsection.component.scss

@@ -1,7 +1,3 @@
-.sub-section {
- position: relative;
-}
-
 .title {
  background-color: #f3f3f3;
  padding: 2px;