Revert "Xeokit updates"

app/assets/stylesheets/layout/_main_menu.sass

@@ -69,9 +69,6 @@ $menu-item-line-height: 30px
       overflow: auto
       @include styled-scroll-bar
 
-  a:focus
-    @include varprop(color, main-menu-font-color)
-      
   ul
     margin: 0
     padding: 0

frontend/npm-shrinkwrap.json

@@ -3352,25 +3352,18 @@
         "@xtuc/long": "4.2.2"
       }
     },
-    "@xeokit/xeokit-bim-viewer": {
-      "version": "1.6.9",
-      "resolved": "https://registry.npmjs.org/@xeokit/xeokit-bim-viewer/-/xeokit-bim-viewer-1.6.9.tgz",
-      "integrity": "sha512-Pg2almxUGtcQYonulyAh8yFeFWd0y7Q2wGM0l9Sb1VXJ9vagapsyXfjGEPZcqMZPi6r+ioY4oaE8kQQq3DWUOw==",
-      "requires": {
-        "@xeokit/xeokit-sdk": "^0.9.1"
-      },
-      "dependencies": {
     "@xeokit/xeokit-sdk": {
-          "version": "0.9.2",
+      "version": "0.8.8",
-          "resolved": "https://registry.npmjs.org/@xeokit/xeokit-sdk/-/xeokit-sdk-0.9.2.tgz",
+      "resolved": "https://registry.npmjs.org/@xeokit/xeokit-sdk/-/xeokit-sdk-0.8.8.tgz",
-          "integrity": "sha512-qfw23HtQajLlyrlQ4OP69+wjZ4B2vSjrlxzW2i7IFCJ7SSC+lnoPs/gT90SGWq3Ox22Qrnc+9Exo6nugC8lJzA=="
+      "integrity": "sha512-e+HTZajykFolCeWm5CIT7HSzOYoRhCxbecpjsXlmfEUYeFZ2Rpxc8CbI/vo62DjwobjFOB/dtyz3xJ2uWkogGg=="
-        }
-      }
     },
-    "@xeokit/xeokit-sdk": {
+    "@xeokit/xeokit-viewer": {
-      "version": "0.9.2",
+      "version": "1.6.4",
-      "resolved": "https://registry.npmjs.org/@xeokit/xeokit-sdk/-/xeokit-sdk-0.9.2.tgz",
+      "resolved": "https://registry.npmjs.org/@xeokit/xeokit-viewer/-/xeokit-viewer-1.6.4.tgz",
-      "integrity": "sha512-qfw23HtQajLlyrlQ4OP69+wjZ4B2vSjrlxzW2i7IFCJ7SSC+lnoPs/gT90SGWq3Ox22Qrnc+9Exo6nugC8lJzA=="
+      "integrity": "sha512-HgY9ceC+Nb6pBxCKlpcQo7cQearilXyVjPI9u5r27ZtHxkm1JDaAVInrDUTsFcpOyL2JBE17Xyb5kfzv9/FujQ==",
+      "requires": {
+        "@xeokit/xeokit-sdk": "^0.8.8"
+      }
     },
     "@xtuc/ieee754": {
       "version": "1.2.0",

frontend/package.json

@@ -70,8 +70,6 @@
     "@uirouter/angular": "^6.0.1",
     "@uirouter/core": "^6.0.4",
     "@uirouter/rx": "^0.6.5",
-    "@xeokit/xeokit-sdk": "^0.9.2",
-    "@xeokit/xeokit-bim-viewer": "^1.6.9",
     "@w11k/ngx-componentdestroyed": "^5.0.2",
     "@xeokit/xeokit-sdk": "^0.8.8",
     "@xeokit/xeokit-viewer": "^1.6.4",

frontend/src/app/modules/bim/ifc_models/ifc-viewer/ifc-viewer.component.ts

@@ -33,7 +33,7 @@ import {IFCViewerService} from "core-app/modules/bim/ifc_models/ifc-viewer/ifc-v
 @Component({
   selector: 'ifc-viewer',
   template: `
-    <div class="ifc-model-viewer--container xeokit-busy-modal-backdrop">
+    <div class="ifc-model-viewer--container">
       <div class="ifc-model-viewer--toolbar-container"></div>
       <canvas class="ifc-model-viewer--model-canvas"></canvas>
     </div>
@@ -59,7 +59,7 @@ export class IFCViewerComponent implements OnInit, OnDestroy {
         explorerElement: jQuery(".ifc-model-viewer--tree-panel")[0], // Left panel
         toolbarElement: element.find(".ifc-model-viewer--toolbar-container")[0], // Toolbar
         navCubeCanvasElement: element.find(".ifc-model-viewer--nav-cube-canvas")[0],
-        busyModelBackdropElement: element.find(".xeokit-busy-modal-backdrop")[0]
+        sectionPlanesOverviewCanvasElement: element.find(".ifc-model-viewer--section-planes-overview-canvas")[0]
       },
       this.Gon.get('ifc_models', 'projects') as any[]
     );

frontend/src/app/modules/bim/ifc_models/ifc-viewer/ifc-viewer.service.ts

@@ -7,7 +7,7 @@ export interface XeokitElements {
   explorerElement:HTMLElement;
   toolbarElement:HTMLElement;
   navCubeCanvasElement:HTMLElement;
-  busyModelBackdropElement:HTMLElement;
+  sectionPlanesOverviewCanvasElement:HTMLElement;
 }
 
 export interface BCFCreationOptions {
@@ -27,7 +27,7 @@ export class IFCViewerService {
   private _viewer:any;
 
   public newViewer(elements:XeokitElements, projects:any[]) {
-    import('@xeokit/xeokit-bim-viewer/dist/main').then((XeokitViewerModule:any) => {
+    import('@xeokit/xeokit-viewer/dist/main').then((XeokitViewerModule:any) => {
       let server = new XeokitServer();
       let viewerUI = new XeokitViewerModule.BIMViewer(server, elements);
 

frontend/src/app/modules/bim/ifc_models/xeokit/xeokit.d.ts

@@ -1,2 +1,2 @@
-declare module '@xeokit/xeokit-bim-viewer/node_modules/@xeokit/xeokit-sdk/src/viewer/scene/utils';
+declare module '@xeokit/xeokit-viewer/node_modules/@xeokit/xeokit-sdk/src/viewer/scene/utils';
-declare module '@xeokit/xeokit-bim-viewer/dist/main';
+declare module '@xeokit/xeokit-viewer/dist/main';

modules/bim/app/assets/stylesheets/bim/ifc_viewer/loading_modal.sass

@@ -1,16 +1,14 @@
-.xeokit-busy-modal-backdrop
-  position: relative
-
 .xeokit-busy-modal
   display: none
-  position: absolute
+  position: fixed
-  z-index: 1000000
   padding-top: 100px
   left: 0
   top: 0
   width: 100%
   height: 100%
+  overflow: auto
   background-color: rgba(0, 0, 0, 0.4)
+  z-index: 30 // OpenProject special
 
 .xeokit-busy-modal-content
   position: relative

modules/bim/app/assets/stylesheets/bim/ifc_viewer/tabs.sass

@@ -105,34 +105,9 @@ $pill-padding-left: 8px
 
       input
         margin-right: 5px
-        vertical-align: middle
 
       span
         cursor: pointer
-        vertical-align: middle
-        &:hover
-          vertical-align: middle
         
   .xeokit-tree-panel > ul
     padding-left: 0
-
-.xeokit-modelsTab
-  .xeokit-form-check
-    padding: 2px 0 2px 15px
-    line-height: 3ex
-
-    input
-      vertical-align: middle
-
-    span
-      display: inline-block
-      @include varprop(color, main-menu-font-color)
-      padding-left: 3px
-      width: calc(100% - 16px)
-      vertical-align: middle
-
-      &:hover
-        cursor: pointer
-
-      &.disabled:hover
-        cursor: default