Bläddra i källkod

refactor: code cleanup

jmacura 5 år sedan
förälder
incheckning
37b332b2f6
4 ändrade filer med 5 tillägg och 14 borttagningar
  1. 2 2
      src/adjuster/index.ts
  2. 1 0
      src/app-js.ts
  3. 1 11
      src/app.component.ts
  4. 1 1
      src/app.service.ts

+ 2 - 2
src/adjuster/index.ts

@@ -10,11 +10,11 @@ export const downgradedModule = downgrade(AdjusterModule);
 
 angular
   .module(downgradedModule, ['hs.core', 'hs.map'])
-  .directive('praAdjusterSidebarBtn', function () {
+  /*.directive('praAdjusterSidebarBtn', function () {
     return {
       template: require('./adjuster-sidebar-btn.directive.html'),
     };
-  })
+  })*/
   .service('AdjusterService', downgradeInjectable(AdjusterService))
   .directive('praAdjuster', downgradeComponent({component: AdjusterComponent}))
   .directive('praAdjusterLoader', () => {

+ 1 - 0
src/app-js.ts

@@ -23,6 +23,7 @@ import {OSM} from 'ol/source';
 import {Tile} from 'ol/layer';
 import {downgradeInjectable} from '@angular/upgrade/static';
 
+import './adjuster/';
 import {AppModule} from './app.module';
 import {AppService} from './app.service';
 import {HsComponent, nuts2Layer, nuts3Layer} from './app.component';

+ 1 - 11
src/app.component.ts

@@ -13,7 +13,6 @@ export const HsComponent = {
   controller: function (
     $scope,
     $compile,
-    $element,
     gettext,
     HsCore,
     HsLayoutService,
@@ -26,20 +25,11 @@ export const HsComponent = {
     vm.exists = HsCore.exists;
     vm.panelVisible = HsLayoutService.panelVisible;
     vm.PraAdjusterService = AdjusterService;
-    //HsLayoutService.fullScreenMap($element, HsCore);
     HsLayoutService.sidebarRight = false;
     // HsLayoutService.sidebarToggleable = false;
-    // HsCore.singleDatasources = true;
-    //HsLayoutService.sidebarButtons = true;
-    //AppService.init();
+    // HsLayoutService.sidebarButtons = true;
     /*$scope.$on('scope_loaded', function (event, args) {
       if (args === 'Sidebar') {
-        const el = angular.element(
-          '<pra-adjuster hs.draggable ng-if="vm.exists(\'pra.adjuster\')" ng-show="vm.panelVisible(\'adjuster\', this)"></pra-adjuster>'
-        )[0];
-        HsLayoutService.panelListElement.appendChild(el);
-        $compile(el)($scope);
-        HsLayoutService.setDefaultPanel('adjuster');
         const loader = angular.element(
           '<pra-adjuster-loader class="loader-splash" ng-if="vm.PraAdjusterService.isClusteringInProcess()"></pra-adjuster-loader>'
         )[0];

+ 1 - 1
src/app.service.ts

@@ -20,7 +20,7 @@ export class AppService {
     this.hsSidebarService.buttons.push({
       panel: 'adjuster',
       module: 'pra.adjuster',
-      order: 6,
+      order: 3,
       title: 'Adjust factors',
       description: 'Opens My Cool Panel',
       icon: 'icon-analytics-piechart',