#69 Fix jqeury import statements

TheHive-Project · Mar 30, 2018 · 4cc4ced · 4cc4ced
1 parent 2f41da5
commit 4cc4ced
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 9 deletions.
diff --git a/www/src/app/core/directives/file-chooser/file-chooser.directive.js b/www/src/app/core/directives/file-chooser/file-chooser.directive.js
@@ -1,5 +1,6 @@
 'use strict';
 
+import $ from 'jquery';
 import Dropzone from 'dropzone';
 
 import tpl from './file-chooser.html';

diff --git a/www/src/app/core/directives/fixed-height/fixed-height.directive.js b/www/src/app/core/directives/fixed-height/fixed-height.directive.js
@@ -1,5 +1,7 @@
 'use strict';
 
+import $ from 'jquery';
+
 export default function(app) {
   app.directive('fixedHeight', fixedHeightDirective);
 
@@ -13,17 +15,17 @@ export default function(app) {
 
     function linkFn(scope, elem /*, attr*/) {
       $timeout(function() {
-        let windowHeight = angular.element(window).height();
-        let footerHeight = angular.element('.main-footer').outerHeight();
-        let headerHeight = angular.element('.main-header').height();
+        let windowHeight = $(window).height();
+        let footerHeight = $('.main-footer').outerHeight();
+        let headerHeight = $('.main-header').height();
 
         elem.css('min-height', windowHeight - headerHeight - footerHeight);
       }, 500);
 
       angular.element($window).bind('resize', function() {
-        let windowHeight = angular.element(window).height();
-        let footerHeight = angular.element('.main-footer').outerHeight();
-        let headerHeight = angular.element('.main-header').height();
+        let windowHeight = $(window).height();
+        let footerHeight = $('.main-footer').outerHeight();
+        let headerHeight = $('.main-header').height();
 
         elem.css('min-height', windowHeight - headerHeight - footerHeight);
       });

diff --git a/www/src/app/index.vendor.js b/www/src/app/index.vendor.js
@@ -1,6 +1,7 @@
 'use strict';
 
-// node_modules
+import $ from 'jquery';
+
 import 'angular';
 
 import '@uirouter/angularjs';
@@ -13,8 +14,6 @@ import 'angular-sanitize';
 
 import 'angular-messages';
 
-import 'jquery';
-
 import 'angular-resource';
 
 import 'angular-ui-bootstrap';