[Frontend] Safety merge of master; minor fixes

open #90 IN-PROGRESS Merged in latest from github/master; Fixed margins when in edit mode; Fixed edit area not utilizing overflow: auto properly; TO-DO: verify mobile is Ok;
nasa · Oct 31, 2015 · c913f17 · c913f17
1 parent b5b6546
commit c913f17
Show file tree

Hide file tree

Showing 14 changed files with 702 additions and 335 deletions.
diff --git a/docs/gendocs.js b/docs/gendocs.js
@@ -187,7 +187,7 @@ GLOBAL.window = GLOBAL.window ||  GLOBAL; // nomnoml expects window to be define
                 destPath = path.dirname(destination),
                 streamOptions = {};
             if (file.match(/png$/)){
-                streamOptions.encoding = 'binary';
+                streamOptions.encoding = null;
             } else {
                 streamOptions.encoding = 'utf8';
             }

diff --git a/platform/commonUI/general/res/sass/helpers/_splitter.scss b/platform/commonUI/general/res/sass/helpers/_splitter.scss
@@ -42,22 +42,20 @@
             @include border-radius($splitterEndCr);
         }
     }
-    &:not(:active) {
-        &:after {
-            @include trans-prop-nice(background-color, 150ms);
-        }
-    }
     &:active {
+        //@include test();
         &:after {
             background-color: $colorSplitterActive !important;
         }
     }
 
     @if $colorSplitterHover != 'none' {
-        &:hover {
-            &:after {
-                @include trans-prop-nice(background-color, 150ms);
-                background-color: $colorSplitterHover;
+        &:not(:active) {
+            &:hover {
+                &:after {
+                    background-color: $colorSplitterHover !important;
+                    @include trans-prop-nice(background-color, 150ms);
+                }
             }
         }
     }

diff --git a/platform/commonUI/general/res/sass/user-environ/_layout.scss b/platform/commonUI/general/res/sass/user-environ/_layout.scss
@@ -95,9 +95,7 @@
 }
 
 .user-environ {
-
     .browse-area,
-    .edit-area,
     .editor {
         top: 0; left: 0; right: 0; bottom: $ueFooterH;
     }
@@ -113,13 +111,17 @@
     .edit-area {
         $tbH: $btnToolbarH + $interiorMargin;
         top: $bodyMargin + $ueTopBarEditH + ($interiorMargin);
+        left: $bodyMargin;
+        right: $bodyMargin;
+        bottom: $bodyMargin + $ueFooterH;
         .tool-bar {
             bottom: auto;
             height: $tbH;
             line-height: $btnToolbarH;
         }
-        .work-area {
+        .object-holder.work-area {
             top: $tbH + $interiorMargin * 2;
+            overflow: auto;
         }
     }
 

diff --git a/platform/commonUI/inspect/src/gestures/InfoGesture.js b/platform/commonUI/inspect/src/gestures/InfoGesture.js
@@ -55,11 +55,6 @@ define(
                 self.trackPosition(event);
             };
 
-            // Also make sure we dismiss bubble if representation is destroyed
-            // before the mouse actually leaves it
-            this.scopeOff =
-                element.scope().$on('$destroy', this.hideBubbleCallback);
-
             this.element = element;
             this.$timeout = $timeout;
             this.infoService = infoService;
@@ -143,7 +138,6 @@ define(
             this.hideBubble();
             // ...and detach listeners
             this.element.off('mouseenter', this.showBubbleCallback);
-            this.scopeOff();
         };
 
         return InfoGesture;