fix cr comments

Azure · timotheeguerin · Sep 22, 2017 · Sep 14, 2017 · Sep 14, 2017 · Sep 14, 2017
commit 90b8ee59287cf48eab6d62c45f17873281af1bea
@@ -50,7 +50,7 @@ export class EditorComponent implements ControlValueAccessor, AfterViewInit, OnC
     public placeholder: string;
     private _value = "";
     private _sub: Subscription;
-    private _erd: any;
+    private _resizeDetector: any;
 
     get value() { return this._value; }
 
@@ -68,11 +68,11 @@ export class EditorComponent implements ControlValueAccessor, AfterViewInit, OnC
         }
     }
     public ngAfterViewInit() {
-        this._erd = elementResizeDetectorMaker({
+        this._resizeDetector = elementResizeDetectorMaker({
             strategy: "scroll",
         });
 
-        this._erd.listenTo(this.elementRef.nativeElement, (element) => {
+        this._resizeDetector.listenTo(this.elementRef.nativeElement, (element) => {
             this.instance.refresh();
         });
 
@@ -86,7 +86,7 @@ export class EditorComponent implements ControlValueAccessor, AfterViewInit, OnC
 
     public ngOnDestroy() {
         this._sub.unsubscribe();
-        this._erd.uninstall(this.elementRef.nativeElement);
+        this._resizeDetector.uninstall(this.elementRef.nativeElement);
     }
 
     public codemirrorInit(config) {

@@ -5,8 +5,7 @@ bl-file-explorer-tabs {
     display: block;
     .tablist {
         height: $tab-height;
-        // border-bottom: 1px solid $border-color;
-        background: #e5e5e5;
+        background: $mercury-grey;
         display: flex;
 
         > .tab {

@@ -1,5 +1,5 @@
 import { FileLoader, FileNavigator, FileTreeNode } from "app/services/file";
-import { log } from "app/utils";
+import { CloudPathUtils, log } from "app/utils";
 import { BehaviorSubject, Observable } from "rxjs";
 
 export interface FileSource {
@@ -35,19 +35,16 @@ export interface CurrentNode {
 export class FileExplorerWorkspace {
     public sources: FileSource[];
     public openedFiles: Observable<OpenedFile[]>;
-    // public openedFolder: Observable<any>;
     public currentSource: Observable<FileSource>;
     public currentNode: Observable<CurrentNode>;
 
     private _currentSource = new BehaviorSubject<FileSource>(null);
     private _currentPath = new BehaviorSubject("");
     private _openedFiles = new BehaviorSubject<OpenedFile[]>([]);
-    // private _openedFolder = new BehaviorSubject<any>(null);
 
     constructor(data: FileNavigator | FileSource | FileSource[]) {
         this.sources = sourcesFrom(data);
         this.openedFiles = this._openedFiles.asObservable();
-        // this.openedFolder = this._openedFolder.asObservable();
         this.currentSource = this._currentSource.asObservable();
         this._currentSource.next(this.sources.first());
 
@@ -87,7 +84,7 @@ export class FileExplorerWorkspace {
     public goBack() {
         const path = this._currentPath.value;
         if (path === "") { return; }
-        this.navigateTo(path.split("/").slice(0, -1).join("/"), this._currentSource.value);
+        this.navigateTo(CloudPathUtils.dirname(path), this._currentSource.value);
     }
 
     public isFileOpen(path: string, source?: FileSource): boolean {
@@ -146,8 +143,9 @@ export class FileExplorerWorkspace {
         if (this.sources.length === 1) {
             return this.sources.first();
         } else {
-            log.error("You must specify a source(FileNavigator) when using multi-source");
-            throw Error("You must specify a source(FileNavigator) when using multi-source");
+            const message = "You must specify a source(FileNavigator) when using multi-source";
+            log.error(message);
+            throw Error(message);
         }
     }
 

@@ -15,9 +15,7 @@
     </bl-clickable>
 </div>
 <div *ngIf="expanded" class="tree-view-content">
-    <div *ngIf="fileNavigator.error">
-        {{fileNavigator.error.message}}
-    </div>
+    <div *ngIf="fileNavigator.error" class="tree-view-error">{{fileNavigator.error.message}}</div>
     <div class="tree-rows-container"
         [class.drop-target]="dropTargetPath === ''"
         (dragenter)="dragEnterRow($event)"

@@ -106,14 +106,18 @@ bl-file-tree-view {
 
         > .file-icon {
             > .fa-folder, > .fa-folder-open {
-                color: #f8d979;
+                color: $folder-color;
             }
 
             > .fa-file {
                 color: $dove-grey;
             }
         }
     }
+
+    .tree-view-error {
+        white-space: pre;
+    }
 }
 
 .toggle-children-wrapper {

@@ -24,6 +24,6 @@
         <bl-file-content [fileLoader]="fileLoader" *ngIf="fileLoader"></bl-file-content>
     </div>
     <div *ngIf="fileNotFound" class="info-overlay file-not-found">
-        File <span class="highlight">&nbsp;{{filename}}&nbsp;</span> doesn't exists.
+        File <span class="highlight">&nbsp;{{filename}}&nbsp;</span> doesn't exist.
     </div>
 </div>
@@ -95,7 +95,7 @@ export class TaskOutputsComponent implements OnChanges, OnDestroy {
                 {
                     name: "Node files",
                     navigator: nodeNavigator,
-                    openedFiles: ["stdout.txt", "stderr.txt", "wd/example-jobs/python/pi.py"],
+                    openedFiles: ["stdout.txt", "stderr.txt"],
                 },
                 { name: "Persisted output", navigator: taskOutputNavigator },
             ]);

@@ -52,6 +52,8 @@ $link-color-hover           : map-get($primary, 800);
 $validation-error-color     : map-get($danger, 500);
 $label-text                 : $dusty-grey;
 
+$folder-color: #f8d979;
+
 $baseFontSize       : 13px;
 $baseLineHeight     : 1.4em;