Skip to content
This repository has been archived by the owner on Jan 27, 2021. It is now read-only.

Commit

Permalink
fixed #21
Browse files Browse the repository at this point in the history
fixed #22
  • Loading branch information
paxtonhare committed Feb 24, 2017
1 parent 2cfc080 commit e7af3f8
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 19 deletions.
23 changes: 7 additions & 16 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ buildscript {

plugins {
id 'java'
id 'com.moowork.node' version '0.13'
id 'com.moowork.node' version '1.1.1'
}

apply plugin: 'spring-boot'
Expand Down Expand Up @@ -48,38 +48,29 @@ dependencies {
}

node {
// Version of node to use.
version = '7.4.0'

// Version of npm to use.
npmVersion = '4.0.5'

download = true

// Set the work directory for unpacking node
workDir = file("${project.buildDir}/nodejs")

// Set the work directory where node_modules should be located
nodeModulesDir = file("${project.projectDir}")
}

task npmInstallUI(type: NpmTask) {
args = ['install']
}

task cleanUI(type: NpmTask) {
args = ['run', 'clean.dist']
dependsOn tasks.npmInstallUI
}

task cleanBuiltUI(type: Delete) {
delete 'src/main/resources/static'
dependsOn tasks.cleanUI
}

task npmInstallUI(type: NpmTask) {
args = ['install']
dependsOn tasks.cleanBuiltUI
}

task buildUI(type: NpmTask) {
args = ['run', 'build.prod']
dependsOn tasks.npmInstallUI
dependsOn tasks.cleanBuiltUI
}

task copyUIAssets(type: Copy) {
Expand Down
1 change: 0 additions & 1 deletion src/main/resources/modules/get-files.xqy
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ declare function local:build-dirs($uris as xs:string*, $parent as xs:string)
$dir
)
let $a := json:array()
let $_ := local:build-files($uris, $parent, $a)
let $_ :=
for $dir in $dirs
let $o := json:object()
Expand Down
2 changes: 1 addition & 1 deletion src/main/ui/app/codemirror/codemirror.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ export class CodemirrorComponent implements OnInit, OnChanges {
this.currentStatement = null;
}

if (this._value === '' || !this._expression || !this._line) {
if (this._value === '' || !this._expression || (this._line === null)) {
return;
}
const lines = this._value.split(/[\r\n]/);
Expand Down
2 changes: 1 addition & 1 deletion src/main/ui/app/home/home.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<mdl-layout-title>
<span class="server">http://{{hostname}}:{{port}}</span> &#x25CF;
<span class="selected-server" *ngIf="selectedServer">{{selectedServer.name}} </span>
</mdl-layout-title>
</mdl-layout-title>
<mdl-layout-spacer></mdl-layout-spacer>
<button mdl-button #btn2="mdlButton" (click)="m2.toggle($event, btn2)" mdl-button-type="icon" mdl-ripple><mdl-icon>more_vert</mdl-icon></button>
<mdl-menu #m2="mdlMenu" mdl-menu-position="bottom-right">
Expand Down
1 change: 1 addition & 0 deletions src/main/ui/app/home/home.component.scss
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ $hover-color: unquote("rgb(#{$palette-debugger-50})");

/deep/ .CodeMirror {
height: 100%;
width: 100%;

.current-statement {
background-color: $hover-color;
Expand Down

0 comments on commit e7af3f8

Please sign in to comment.