Merge branch 'release-5.17.2'

WISE-Community · Oct 2, 2020 · 9b2be8f · 9b2be8f
2 parents 0ca4480 + d025def
commit 9b2be8f
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 19 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "wise",
-  "version": "5.17.1",
+  "version": "5.17.2",
   "description": "Web-based Inquiry Science Environment",
   "main": "app.js",
   "browserslist": [

diff --git a/pom.xml b/pom.xml
@@ -34,7 +34,7 @@
   <artifactId>wise</artifactId>
   <packaging>war</packaging>
   <name>Web-based Inquiry Science Environment</name>
-  <version>5.17.1</version>
+  <version>5.17.2</version>
   <url>http://wise5.org</url>
   <licenses>
     <license>

diff --git a/src/main/resources/version.txt b/src/main/resources/version.txt
@@ -1 +1 @@
-5.17.1
+5.17.2
diff --git a/src/main/webapp/wise5/components/table/tableAuthoringController.ts b/src/main/webapp/wise5/components/table/tableAuthoringController.ts
@@ -8,9 +8,8 @@ class TableAuthoringController extends TableController {
   ProjectAssetService: ProjectAssetService;
 
   static $inject = [
-    '$anchorScroll',
     '$filter',
-    '$location',
+    '$injector',
     '$mdDialog',
     '$q',
     '$rootScope',
@@ -30,10 +29,8 @@ class TableAuthoringController extends TableController {
   ];
 
   constructor(
-    $anchorScroll,
     $filter,
     $injector,
-    $location,
     $mdDialog,
     $q,
     $rootScope,
@@ -52,10 +49,8 @@ class TableAuthoringController extends TableController {
     UtilService
   ) {
     super(
-      $anchorScroll,
       $filter,
       $injector,
-      $location,
       $mdDialog,
       $q,
       $rootScope,

diff --git a/src/main/webapp/wise5/components/table/tableController.ts b/src/main/webapp/wise5/components/table/tableController.ts
@@ -6,8 +6,6 @@ import ComponentController from '../componentController';
 import { TableService } from './tableService';
 
 class TableController extends ComponentController {
-  $anchorScroll: any;
-  $location: any;
   $q: any;
   TableService: TableService;
   allowedConnectedComponentTypes: any[];
@@ -35,10 +33,8 @@ class TableController extends ComponentController {
   dataExplorerXColumn: number;
 
   static $inject = [
-    '$anchorScroll',
     '$filter',
     '$injector',
-    '$location',
     '$mdDialog',
     '$q',
     '$rootScope',
@@ -57,10 +53,8 @@ class TableController extends ComponentController {
   ];
 
   constructor(
-    $anchorScroll,
     $filter,
     $injector,
-    $location,
     $mdDialog,
     $q,
     $rootScope,
@@ -95,8 +89,6 @@ class TableController extends ComponentController {
       StudentDataService,
       UtilService
     );
-    this.$anchorScroll = $anchorScroll;
-    this.$location = $location;
     this.$q = $q;
     this.TableService = TableService;
 
@@ -327,7 +319,7 @@ class TableController extends ComponentController {
   }
 
   registerStudentWorkSavedToServerListener() {
-    this.studentWorkSavedToServerSubscription = 
+    this.studentWorkSavedToServerSubscription =
         this.StudentDataService.studentWorkSavedToServer$.subscribe((args: any) => {
       const componentState = args.studentWork;
       if (this.isForThisComponent(componentState)) {