Skip to content

Commit de2c862

Browse files
jansulejansule
committed
EsLint
 * linting all files * creating uploadModal.controller.js
1 parent 27a56d3 commit de2c862

23 files changed

+174
-154
lines changed

‎.eslintignore

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
1-
#ignore configSample.js
1+
# ignore configSample.js
22
client/app/config/configSample.js
33

4+
# ignore config.js
5+
client/app/config/config.js
6+
47
# ignore spec file for now
5-
client/app/ercView/publications.spec
8+
client/app/ercView/publications.spec.js

‎client/app/analysisStatsView/o2rAnalysisStats.directive.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,14 +105,14 @@
105105

106106
function activate(){
107107
try {
108-
scope.lFin = JSON.parse(scope.lFinished);
108+
scope.lFin = angular.fromJson(scope.lFinished); //JSON.parse(scope.lFinished);
109109
} catch (error) {
110110
$log.debug(error);
111111
scope.lFin = {};
112112
}
113113

114114
try {
115-
scope.lStar = JSON.parse(scope.lStarted);
115+
scope.lStar = angular.fromJson(scope.lStarted); //JSON.parse(scope.lStarted);
116116
} catch (error) {
117117
$log.debug(error);
118118
scope.lStar = {};

‎client/app/app.js

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
(function(){
22
'use strict';
3-
3+
/* eslint-disable angular/window-service */
44
window.__env = window.__env || {};
55

66
var env = {
@@ -13,6 +13,7 @@
1313
};
1414
env.api = env.server + env.c_api;
1515

16+
/* eslint-enable angular/window-service */
1617
angular
1718
.module('starter', [
1819
"treeControl",
@@ -33,11 +34,12 @@
3334
config.$inject = ['$stateProvider', '$urlRouterProvider', '$mdThemingProvider', '$logProvider', 'hljsServiceProvider', '$analyticsProvider'];
3435

3536
function config($stateProvider, $urlRouterProvider, $mdThemingProvider, $logProvider, hljsServiceProvider, $analyticsProvider){
37+
/* eslint-disable angular/window-service, angular/log */
3638
$analyticsProvider.developerMode(window.__env.disableTracking);
3739
if(window.__env.disableTracking) console.log("Tracking globally disabled!");
3840

3941
$logProvider.debugEnabled(window.__env.enableDebug);
40-
42+
/* eslint-enable angular/window-service, angular/log */
4143
hljsServiceProvider.setOptions({
4244
tabReplace: ' '
4345
});
@@ -129,13 +131,13 @@
129131
.state('home', {
130132
url: "/home",
131133
templateUrl: "app/homeView/home.html",
132-
controller: 'HomeCtrl',
134+
controller: 'HomeController',
133135
controllerAs: 'vm'
134136
})
135137
.state('erc', {
136138
url: "/erc/:ercid",
137139
templateUrl: "app/ercView/erc.html",
138-
controller: 'ErcCtrl',
140+
controller: 'ErcController',
139141
controllerAs: 'vm',
140142
resolve: {
141143
compInfo: compInfoService,
@@ -146,7 +148,7 @@
146148
.state('author', {
147149
url: "/author/:authorid",
148150
templateUrl: "app/authorView/author.html",
149-
controller: 'AuthorCtrl',
151+
controller: 'AuthorController',
150152
controllerAs: 'vm',
151153
resolve: {
152154
authorInfo: authorInfoService
@@ -155,7 +157,7 @@
155157
.state('search', {
156158
url: "/search?q",
157159
templateUrl: "app/searchView/search.html",
158-
controller: 'SearchCtrl',
160+
controller: 'SearchController',
159161
controllerAs: 'vm',
160162
resolve: {
161163
searchResults: searchResultsService
@@ -164,13 +166,13 @@
164166
.state('impressum', {
165167
url: "/impressum",
166168
templateUrl: "app/templates/impressum.html",
167-
controller: 'ImpressumCtrl',
169+
controller: 'ImpressumController',
168170
controllerAs: 'vm'
169171
})
170172
.state('privacy', {
171173
url: "/privacy",
172174
templateUrl: "app/templates/privacy.html",
173-
controller: 'PrivacyCtrl',
175+
controller: 'PrivacyController',
174176
controllerAs: 'vm'
175177
})
176178
.state('404', {

‎client/app/authorView/author.controller.js

Lines changed: 7 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33

44
angular
55
.module('starter')
6-
.controller('AuthorCtrl', AuthorCtrl);
6+
.controller('AuthorController', AuthorController);
77

8-
AuthorCtrl.$inject = ['$scope', '$stateParams','$log', '$mdDialog', 'metadata', 'authorInfo', 'Upload', 'env', 'header', 'icons', 'jobs'];
8+
AuthorController.$inject = ['$scope', '$stateParams','$log', '$document', '$mdDialog', 'metadata', 'authorInfo', 'Upload', 'env', 'header', 'icons'];
99

10-
function AuthorCtrl($scope, $stateParams, $log, $mdDialog, metadata, authorInfo, Upload, env, header, icons, jobs){
10+
function AuthorController($scope, $stateParams, $log, $document, $mdDialog, metadata, authorInfo, Upload, env, header, icons){
1111
var vm = this;
1212

13-
var authorId = $stateParams.authorid; // id from author
13+
1414

1515
vm.icons = icons;
1616
vm.allPubs = getAuthorInfo();
@@ -46,9 +46,10 @@
4646

4747
function openDialog(ev){
4848
$mdDialog.show({
49-
controller: ModalInstanceCtrl,
49+
controller: 'UploadModalController',
50+
controllerAs: 'vm',
5051
templateUrl: 'app/upload/uploadModal.html',
51-
parent: angular.element(document.body),
52+
parent: $document[0].body,
5253
targetEvent: ev,
5354
clickOutsideToClose: true,
5455
fullscreen: false
@@ -59,72 +60,5 @@
5960
$scope.$on('loadedAllComps', function(event, data){ //allPubs will be set to comp_meta from metadata factory
6061
vm.allPubs = data;
6162
});
62-
63-
function ModalInstanceCtrl($scope, $mdDialog, Upload, env, icons, jobs){
64-
$scope.icons = icons;
65-
$scope.checkRunAnalysis = true;
66-
$scope.cancel = () => {$mdDialog.cancel()};
67-
$scope.selected = (file) => {$scope.f = file;};
68-
$scope.onLoad = false;
69-
$scope.doneButton = false;
70-
$scope.fileSelected = false;
71-
$scope.uploadError;
72-
$scope.submit = function(){
73-
if($scope.form.file.$valid && $scope.file){
74-
//deactivate submit button
75-
$scope.fileSelected = false;
76-
77-
$scope.onLoad = true;
78-
uploader($scope.file);
79-
}
80-
};
81-
82-
$scope.$watch('file', function(news, old){
83-
if(typeof news !== 'undefined'){
84-
$log.debug('selected File: ', news);
85-
$scope.fileSelected = true;
86-
}
87-
});
88-
////////
89-
90-
function uploader(file){
91-
Upload.upload({
92-
url: env.api + '/compendium',
93-
data: {compendium: file, 'content_type': 'compendium_v1'}
94-
})
95-
.then(successCallback, errorCallback, progress)
96-
.then(execJobCallback, errorCallback);
97-
98-
function successCallback(response){
99-
if($scope.checkRunAnalysis){
100-
return jobs.executeJob(response.data.id);
101-
} else {
102-
$log.debug('upload successCallback: %o', response);
103-
$scope.doneButton = true;
104-
metadata.callMetadata_author(authorId);
105-
$scope.checkUpload = true;
106-
file.progress = 100;
107-
}
108-
}
109-
function errorCallback(response){
110-
file.progress = 100;
111-
$scope.doneButton = true;
112-
$scope.checkUpload = false;
113-
$scope.uploadError = response;
114-
}
115-
function progress(evt){
116-
file.progress = parseInt(95.0 * evt.loaded/evt.total);
117-
}
118-
function execJobCallback(response){
119-
$log.debug('upload execJobCallback: %o', response);
120-
if($scope.checkRunAnalysis){
121-
$scope.doneButton = true;
122-
metadata.callMetadata_author(authorId);
123-
$scope.checkUpload = true;
124-
file.progress = 100;
125-
}
126-
}
127-
}
128-
}
12963
}
13064
})();

‎client/app/authorView/author.html

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ <h4 flex><b>Created on:</b> {{pub.created | date : 'yyyy-MM-dd HH:mm'}}</h4>
4949
<h4 flex><b>by</b> {{pub.user}}</h4>
5050
</div>
5151
<div>
52-
<!--<md-button ui-sref="erc({ercid: pub.id})"><md-icon aria-label md-svg-src="{{vm.icons.forward}}"></md-icon></md-button>-->
5352
<md-button ng-click="vm.selectComp(pub)"><md-icon aria-label md-svg-src="{{vm.icons.info_outline}}"></md-icon></md-button>
5453
</div>
5554
</div>

‎client/app/ercView/erc.controller.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33

44
angular
55
.module('starter')
6-
.controller('ErcCtrl', ErcCtrl);
6+
.controller('ErcController', ErcController);
77

8-
ErcCtrl.$inject = ['$scope', '$stateParams','$log', '$mdDialog', 'publications', 'jobs', 'compInfo', 'compFJob', 'compSJob', 'env', 'icons', 'header', 'httpRequests', 'login'];
8+
ErcController.$inject = ['$scope', '$stateParams','$log', '$mdDialog', 'publications', 'jobs', 'compInfo', 'compFJob', 'compSJob', 'env', 'icons', 'header', 'httpRequests', 'login'];
99

10-
function ErcCtrl($scope, $stateParams, $log, $mdDialog, publications, jobs, compInfo, compFJob, compSJob, env, icons, header, socket, httpRequests, login){
10+
function ErcController($scope, $stateParams, $log, $mdDialog, publications, jobs, compInfo, compFJob, compSJob, env, icons, header, socket, httpRequests, login){
1111
var vm = this;
1212
vm.fJob = compFJob.data;
1313
vm.sJob = compSJob.data;

‎client/app/ercView/o2rDisplayFiles.directive.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,10 @@
3535

3636
attrs.$observe('o2rFile', function(value){
3737
if(value != ''){
38-
scope.file = JSON.parse(value);
38+
scope.file = angular.fromJson(value);
3939
var mime;
4040
// if no mime type is defined hljs will be used for display
41-
if(typeof scope.file.type !== 'undefined'){
41+
if(angular.isDefined(scope.file.type)){
4242
mime = scope.file.type.split('/');
4343
scope.mime = mime[0];
4444
} else {

‎client/app/ercView/publications.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
var object = o;
4343
var searchedFile = path;
4444

45-
if(typeof object.children != 'undefined'){
45+
if(angular.isDefined(object.children)){
4646
for(var content in object.children){
4747
iterator(object.children[content], searchedFile);
4848
}

‎client/app/headerView/header.controller.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33

44
angular
55
.module('starter')
6-
.controller('HeaderCtrl', HeaderCtrl);
6+
.controller('HeaderController', HeaderController);
77

8-
HeaderCtrl.$inject = ['$scope', 'header'];
8+
HeaderController.$inject = ['$scope', 'header'];
99

10-
function HeaderCtrl ($scope, header){
10+
function HeaderController ($scope, header){
1111
var vm = this;
1212
vm.page = header;
1313
}

‎client/app/homeView/home.controller.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33

44
angular
55
.module('starter')
6-
.controller('HomeCtrl', HomeCtrl);
6+
.controller('HomeController', HomeController);
77

8-
HomeCtrl.$inject = ['$log', '$scope', '$location', 'header'];
8+
HomeController.$inject = ['$log', '$scope', '$location', 'header'];
99

10-
function HomeCtrl($log, $scope, $location, header){
10+
function HomeController($log, $scope, $location, header){
1111
var vm = this;
1212
vm.submit = submitter;
1313

@@ -20,7 +20,7 @@
2020
}
2121

2222
function submitter(){
23-
if (vm.searchModel!=undefined && vm.searchModel.trim() != ""){
23+
if (angular.isDefined(vm.searchModel) && vm.searchModel.trim() != ""){
2424
var _query = vm.searchModel.replace(/ /g, "+");
2525
$location.path('/search').search('q=' + _query);
2626
}

0 commit comments

Comments
 (0)