Apply Javascript styleguide
This commit is contained in:
parent
752ce964c8
commit
6e0f351093
30 changed files with 364 additions and 375 deletions
|
|
@ -1,17 +1,17 @@
|
|||
export class FilesController {
|
||||
constructor($scope, UserService, EventService, files) {
|
||||
$scope.$root.user = UserService.get();
|
||||
files.$promise.then(function() {
|
||||
files.$promise.then(() => {
|
||||
$scope.$root.loadingView = false;
|
||||
});
|
||||
$scope.header = 'full';
|
||||
if (!$scope.$root.files) {
|
||||
$scope.$root.files = files;
|
||||
}
|
||||
$scope.remove = function(file) {
|
||||
$scope.$root.files.some(function(existingFile, index) {
|
||||
$scope.remove = (file) => {
|
||||
$scope.$root.files.some((existingFile, index) => {
|
||||
if (file.id === existingFile.id) {
|
||||
file.$remove(function() {
|
||||
file.$remove(() => {
|
||||
$scope.$root.showDropdown = false;
|
||||
$scope.$root.files.splice(index, 1);
|
||||
});
|
||||
|
|
@ -25,8 +25,8 @@ export class FilesController {
|
|||
FilesController.$inject = ['$scope', 'UserService', 'EventService', 'files'];
|
||||
|
||||
export class FileController {
|
||||
constructor ($scope, $rootScope, $routeParams, ReconnectingWebSocket, file) {
|
||||
file.$promise.then(function() {
|
||||
constructor($scope, $rootScope, $routeParams, ReconnectingWebSocket, file) {
|
||||
file.$promise.then(() => {
|
||||
$scope.$root.loadingView = false;
|
||||
$scope.header = 'small';
|
||||
$scope.file = file;
|
||||
|
|
@ -34,25 +34,25 @@ export class FileController {
|
|||
$rootScope.pageTitle = ' - ' + file.name;
|
||||
if (file.status === 'uploading') {
|
||||
file.percent = 0;
|
||||
var ws = new ReconnectingWebSocket(window.settings.apiURL.replace(/^http/, 'ws') + '/file/' + file.id);
|
||||
ws.onmessage = function (msg) {
|
||||
var evt = JSON.parse(msg.data);
|
||||
const ws = new ReconnectingWebSocket(window.settings.apiURL.replace(/^http/, 'ws') + '/file/' + file.id);
|
||||
ws.onmessage = (msg) => {
|
||||
const evt = JSON.parse(msg.data);
|
||||
$rootScope.$broadcast(evt.type, evt.data);
|
||||
};
|
||||
ws.onopen = function() {
|
||||
ws.onopen = () => {
|
||||
ws.send(JSON.stringify({authorization: window.user.token}));
|
||||
};
|
||||
$rootScope.$on('file-progress', function(evt, data) {
|
||||
$rootScope.$on('file-progress', (evt, data) => {
|
||||
$scope.file.percent = data.complete;
|
||||
});
|
||||
$rootScope.$on('file-added', function(evt, data) {
|
||||
$rootScope.$on('file-added', (evt, data) => {
|
||||
$scope.file = data;
|
||||
});
|
||||
$rootScope.$on('file-accepted', function(evt, data) {
|
||||
$rootScope.$on('file-accepted', (evt, data) => {
|
||||
$scope.file = data;
|
||||
});
|
||||
}
|
||||
}, function() {
|
||||
}, () => {
|
||||
$rootScope.navError = true;
|
||||
$scope.$root.loadingView = false;
|
||||
});
|
||||
|
|
@ -61,15 +61,15 @@ export class FileController {
|
|||
FileController.$inject = ['$scope', '$rootScope', '$routeParams', 'WebSocket', 'file'];
|
||||
|
||||
export class ProController {
|
||||
constructor ($scope, $http, UserService) {
|
||||
constructor($scope, $http, UserService) {
|
||||
$scope.$root.loadingView = false;
|
||||
$scope.user = UserService.get();
|
||||
$scope.header = 'full';
|
||||
$scope.cancel = function() {
|
||||
$http.post('/pro/cancel').success(function() {
|
||||
$scope.cancel = () => {
|
||||
$http.post('/pro/cancel').success(() => {
|
||||
window.location.reload(true);
|
||||
}).error(function(data) {
|
||||
console.log(new Error(data));
|
||||
}).error((data) => {
|
||||
console.error(new Error(data));
|
||||
});
|
||||
};
|
||||
}
|
||||
|
|
@ -77,17 +77,17 @@ export class ProController {
|
|||
ProController.$inject = ['$scope', '$http', 'UserService'];
|
||||
|
||||
export class AccountController {
|
||||
constructor ($scope, UserService, SettingService) {
|
||||
constructor($scope, UserService, SettingService) {
|
||||
$scope.$root.loadingView = false;
|
||||
$scope.$root.user = UserService.get();
|
||||
$scope.submit = function(form) {
|
||||
$scope.submit = (form) => {
|
||||
$scope.updated = false;
|
||||
$scope.error = false;
|
||||
SettingService.update(form).then(function() {
|
||||
SettingService.update(form).then(() => {
|
||||
$scope.updated = true;
|
||||
delete $scope.user.new_password;
|
||||
delete $scope.user.current_password;
|
||||
}, function(response) {
|
||||
}, (response) => {
|
||||
$scope.error = response.data.error.message;
|
||||
});
|
||||
};
|
||||
|
|
@ -96,7 +96,7 @@ export class AccountController {
|
|||
AccountController.$inject = ['$scope', 'UserService', 'SettingService'];
|
||||
|
||||
export class BillingController {
|
||||
constructor ($scope, UserService, TransactionService) {
|
||||
constructor($scope, UserService, TransactionService) {
|
||||
$scope.$root.loadingView = false;
|
||||
$scope.$root.user = UserService.get();
|
||||
$scope.transactions = TransactionService.query();
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ export function appHeader() {
|
|||
scope.userMD5 = window.user.md5;
|
||||
scope.email = window.user.email;
|
||||
scope.pro = (window.user.type === 'Pro');
|
||||
}
|
||||
},
|
||||
};
|
||||
}
|
||||
|
||||
|
|
@ -23,19 +23,19 @@ export function appFooter() {
|
|||
scope.userMD5 = window.user.md5;
|
||||
scope.email = window.user.email;
|
||||
scope.pro = (window.user.type === 'Pro');
|
||||
}
|
||||
},
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
export function menuDropdown() {
|
||||
return function($scope, element) {
|
||||
return ($scope, element) => {
|
||||
$scope.$root.overlayClick = function overlayClick() {
|
||||
$scope.$root.showDropdown = false;
|
||||
$('.dropdown').hide();
|
||||
};
|
||||
var activeDropdown = $(element).find('.dropdown');
|
||||
element.on('click', function(e) {
|
||||
const activeDropdown = $(element).find('.dropdown');
|
||||
element.on('click', (e) => {
|
||||
if (activeDropdown.not(':visible').length > 0) {
|
||||
$('.dropdown').hide();
|
||||
$scope.$root.showDropdown = true;
|
||||
|
|
@ -50,10 +50,10 @@ export function menuDropdown() {
|
|||
}
|
||||
|
||||
|
||||
export function searchShortcut ($document) {
|
||||
return function($scope, element) {
|
||||
$document.bind('keypress', function(event) {
|
||||
if(event.which === 47) {
|
||||
export function searchShortcut($document) {
|
||||
return ($scope, element) => {
|
||||
$document.bind('keypress', (event) => {
|
||||
if (event.which === 47) {
|
||||
if (['INPUT', 'TEXTAREA'].indexOf(document.activeElement.tagName) < 0) {
|
||||
element[0].focus();
|
||||
event.preventDefault();
|
||||
|
|
@ -68,21 +68,23 @@ export function stripeSubscribe($http) {
|
|||
const handler = window.StripeCheckout.configure({
|
||||
key: window.settings.stripePublic,
|
||||
image: '/images/stripe-128.png',
|
||||
token: function(token) {
|
||||
$http.post('/pro/create', {stripeToken: token})
|
||||
.success(function(data) {
|
||||
token: (token) => {
|
||||
$http.post('/pro/create', {
|
||||
stripeToken: token,
|
||||
})
|
||||
.success((data) => {
|
||||
if (data.status === 'active') {
|
||||
window.user.plan = 'Pro';
|
||||
window.location.reload(true);
|
||||
}
|
||||
})
|
||||
.error(function() {
|
||||
alert('Error upgrading your account');
|
||||
.error(() => {
|
||||
console.error('Error upgrading your account');
|
||||
});
|
||||
}
|
||||
},
|
||||
});
|
||||
return function(scope, element) {
|
||||
element.on('click', function() {
|
||||
return (scope, element) => {
|
||||
element.on('click', () => {
|
||||
// Open Checkout with further options
|
||||
handler.open({
|
||||
name: 'Hostr',
|
||||
|
|
@ -91,7 +93,7 @@ export function stripeSubscribe($http) {
|
|||
amount: 600,
|
||||
currency: 'USD',
|
||||
panelLabel: 'Subscribe {{amount}}',
|
||||
billingAddress: false
|
||||
billingAddress: false,
|
||||
});
|
||||
});
|
||||
};
|
||||
|
|
|
|||
|
|
@ -11,56 +11,56 @@ function guid() {
|
|||
}
|
||||
|
||||
export default function dropzone(FileService, $cacheFactory) {
|
||||
var dropOverlay = document.getElementById('filedrop-overlay');
|
||||
var dropzoneEl;
|
||||
var errorTimeout;
|
||||
return function($scope) {
|
||||
$scope.$on('$viewContentLoaded', function() {
|
||||
const dropOverlay = document.getElementById('filedrop-overlay');
|
||||
let dropzoneEl;
|
||||
let errorTimeout;
|
||||
return ($scope) => {
|
||||
$scope.$on('$viewContentLoaded', () => {
|
||||
if (!dropzoneEl) {
|
||||
$scope.$root.uploadingFiles = [];
|
||||
var clickable = [].slice.call(document.querySelectorAll('.choose-file'));
|
||||
const clickable = [].slice.call(document.querySelectorAll('.choose-file'));
|
||||
|
||||
dropzoneEl = new Dropzone(document.body, {
|
||||
url: window.settings.apiURL + '/file',
|
||||
maxFilesize: window.user.maxFileSize / 1024 / 1024,
|
||||
maxThumbnailFilesize: 5,
|
||||
thumbnailWidth: 150,
|
||||
thumbnailHeight: 98,
|
||||
parallelUploads: 1,
|
||||
uploadMultiple: false,
|
||||
clickable: clickable.length ? clickable : false,
|
||||
autoDiscover: false,
|
||||
headers: {'Authorization': ':' + window.user.token},
|
||||
previewsContainer: false
|
||||
url: window.settings.apiURL + '/file',
|
||||
maxFilesize: window.user.maxFileSize / 1024 / 1024,
|
||||
maxThumbnailFilesize: 5,
|
||||
thumbnailWidth: 150,
|
||||
thumbnailHeight: 98,
|
||||
parallelUploads: 1,
|
||||
uploadMultiple: false,
|
||||
clickable: clickable.length ? clickable : false,
|
||||
autoDiscover: false,
|
||||
headers: {'Authorization': ':' + window.user.token},
|
||||
previewsContainer: false,
|
||||
});
|
||||
dropzoneEl.on('thumbnail', function(file, thumbnail){
|
||||
dropzoneEl.on('thumbnail', (file, thumbnail) => {
|
||||
file.thumbnail = thumbnail;
|
||||
$scope.$apply();
|
||||
});
|
||||
dropzoneEl.on('addedfile', function(file){
|
||||
var id = guid();
|
||||
dropzoneEl.on('addedfile', (file) => {
|
||||
const id = guid();
|
||||
file.guid = id;
|
||||
$scope.$root.uploadingFiles.push(file);
|
||||
$scope.$apply();
|
||||
});
|
||||
dropzoneEl.on('sending', function(file, xhr) {
|
||||
dropzoneEl.on('sending', (file, xhr) => {
|
||||
xhr.setRequestHeader('hostr-guid', file.guid);
|
||||
});
|
||||
dropzoneEl.on('uploadprogress', function(file, progress) {
|
||||
dropzoneEl.on('uploadprogress', (file, progress) => {
|
||||
$scope.$root.progress = {
|
||||
name: file.name,
|
||||
percent: progress,
|
||||
status: 'Uploading'
|
||||
status: 'Uploading',
|
||||
};
|
||||
if (progress === 100) {
|
||||
$scope.$root.progress.status = 'Processing';
|
||||
}
|
||||
$scope.$apply();
|
||||
});
|
||||
dropzoneEl.on('complete', function(file){
|
||||
dropzoneEl.on('complete', (file) => {
|
||||
delete $scope.$root.progress;
|
||||
$scope.$apply();
|
||||
$scope.$root.uploadingFiles.some(function(uploadingFile, index) {
|
||||
$scope.$root.uploadingFiles.some((uploadingFile, index) => {
|
||||
if (uploadingFile.guid === file.guid) {
|
||||
$scope.$root.uploadingFiles.splice(index, 1);
|
||||
$scope.$apply();
|
||||
|
|
@ -69,11 +69,10 @@ export default function dropzone(FileService, $cacheFactory) {
|
|||
return false;
|
||||
});
|
||||
});
|
||||
dropzoneEl.on('error', function(evt, error){
|
||||
dropzoneEl.on('error', (evt, error) => {
|
||||
if (error.error) {
|
||||
$scope.$root.uploadError = 'Error uploading file: ' + evt.name + '. ' + error.error.message;
|
||||
}
|
||||
else if (evt.name) {
|
||||
} else if (evt.name) {
|
||||
$scope.$root.uploadError = 'Error uploading file: ' + evt.name + '. ' + error;
|
||||
} else {
|
||||
if (error[0] !== '<') {
|
||||
|
|
@ -82,33 +81,33 @@ export default function dropzone(FileService, $cacheFactory) {
|
|||
}
|
||||
$scope.$apply();
|
||||
clearTimeout(errorTimeout);
|
||||
errorTimeout = setTimeout(function() {
|
||||
errorTimeout = setTimeout(() => {
|
||||
$scope.$root.uploadError = '';
|
||||
$scope.$apply();
|
||||
}, 5000);
|
||||
});
|
||||
|
||||
var addFile = function(newFile) {
|
||||
if (!$scope.$root.files.some(function (file) {
|
||||
return file.id === newFile.id;
|
||||
})) {
|
||||
var cache = $cacheFactory.get('files-cache');
|
||||
const addFile = (newFile) => {
|
||||
if (!$scope.$root.files.some((file) => {
|
||||
return file.id === newFile.id;
|
||||
})) {
|
||||
const cache = $cacheFactory.get('files-cache');
|
||||
cache.removeAll();
|
||||
var file = new FileService(newFile);
|
||||
const file = new FileService(newFile);
|
||||
$scope.$root.files.unshift(file);
|
||||
$scope.$root.user.uploads_today++;
|
||||
$scope.$apply();
|
||||
}
|
||||
};
|
||||
|
||||
dropzoneEl.on('success', function(file, response){
|
||||
dropzoneEl.on('success', (file, response) => {
|
||||
addFile(response);
|
||||
});
|
||||
$scope.$on('file-added', function(event, data){
|
||||
$scope.$on('file-added', (event, data) => {
|
||||
addFile(data);
|
||||
});
|
||||
$scope.$on('file-accepted', function(event, data){
|
||||
$scope.$root.uploadingFiles.some(function(file) {
|
||||
$scope.$on('file-accepted', (event, data) => {
|
||||
$scope.$root.uploadingFiles.some((file) => {
|
||||
if (file.guid === data.guid) {
|
||||
file.id = data.id;
|
||||
file.href = data.href;
|
||||
|
|
@ -117,33 +116,33 @@ export default function dropzone(FileService, $cacheFactory) {
|
|||
}
|
||||
});
|
||||
});
|
||||
$scope.$on('file-deleted', function(evt, data) {
|
||||
$scope.$root.files.forEach(function(file, index) {
|
||||
if(data.id === file.id) {
|
||||
$scope.$on('file-deleted', (evt, data) => {
|
||||
$scope.$root.files.forEach((file, index) => {
|
||||
if (data.id === file.id) {
|
||||
delete $scope.$root.files[index];
|
||||
$scope.$digest();
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
document.body.addEventListener('dragenter', function(){
|
||||
document.body.addEventListener('dragenter', () => {
|
||||
dropOverlay.style.display = 'block';
|
||||
});
|
||||
|
||||
dropOverlay.addEventListener('dragleave', function(event){
|
||||
dropOverlay.addEventListener('dragleave', (event) => {
|
||||
if (event.target.outerText !== 'Drop files to upload' || event.x === 0) {
|
||||
dropOverlay.style.display = 'none';
|
||||
}
|
||||
});
|
||||
|
||||
dropOverlay.addEventListener('drop', function(){
|
||||
dropOverlay.addEventListener('drop', () => {
|
||||
dropOverlay.style.display = 'none';
|
||||
});
|
||||
} else {
|
||||
var clicker = [].slice.call(document.querySelectorAll('.choose-file'));
|
||||
const clicker = [].slice.call(document.querySelectorAll('.choose-file'));
|
||||
if (clicker) {
|
||||
clicker.forEach(function(el) {
|
||||
el.addEventListener('click', function() {
|
||||
clicker.forEach((el) => {
|
||||
el.addEventListener('click', () => {
|
||||
return dropzoneEl.hiddenFileInput.click();
|
||||
});
|
||||
});
|
||||
|
|
|
|||
|
|
@ -1,33 +1,29 @@
|
|||
export function fileSize() {
|
||||
return function(input) {
|
||||
return (input) => {
|
||||
if (input >= 1073741824) {
|
||||
input = Math.round((input / 1073741824) * 10) / 10 + 'GB';
|
||||
} else {
|
||||
if (input >= 1048576) {
|
||||
input = Math.round((input / 1048576) * 10) / 10 + 'MB';
|
||||
} else {
|
||||
if (input >= 1024) {
|
||||
input = Math.round((input / 1024) * 10) / 10 + 'KB';
|
||||
} else {
|
||||
input = Math.round(input) + 'B';
|
||||
}
|
||||
}
|
||||
return Math.round((input / 1073741824) * 10) / 10 + 'GB';
|
||||
}
|
||||
return input;
|
||||
if (input >= 1048576) {
|
||||
return Math.round((input / 1048576) * 10) / 10 + 'MB';
|
||||
}
|
||||
if (input >= 1024) {
|
||||
return Math.round((input / 1024) * 10) / 10 + 'KB';
|
||||
}
|
||||
return Math.round(input) + 'B';
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
export function direct() {
|
||||
return function(file) {
|
||||
if(file.name) {
|
||||
return (file) => {
|
||||
if (file.name) {
|
||||
if (file.direct && file.name.split('.').pop().toLowerCase() === 'psd') {
|
||||
return file.direct['970x'].replace('/970/', '/').slice(0, -4);
|
||||
} else if (file.direct && file.direct['970x']) {
|
||||
return file.direct['970x'].replace('/970/', '/');
|
||||
} else {
|
||||
return file.href.replace('hostr.co/', 'hostr.co/file/') + '/' + file.name;
|
||||
}
|
||||
if (file.direct && file.direct['970x']) {
|
||||
return file.direct['970x'].replace('/970/', '/');
|
||||
}
|
||||
return file.href.replace('hostr.co/', 'hostr.co/file/') + '/' + file.name;
|
||||
}
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,72 +1,92 @@
|
|||
export class FileService {
|
||||
constructor($resource, $cacheFactory) {
|
||||
var cache = $cacheFactory('files-cache');
|
||||
return $resource(window.settings.apiURL + '/file/:id', {id: '@id'}, {
|
||||
query: {method: 'GET', isArray: true, cache: cache,
|
||||
params: {perpage: 0, all: true}
|
||||
constructor($resource, $cacheFactory) {
|
||||
const cache = $cacheFactory('files-cache');
|
||||
return $resource(window.settings.apiURL + '/file/:id', {
|
||||
id: '@id',
|
||||
}, {
|
||||
query: {
|
||||
method: 'GET',
|
||||
isArray: true,
|
||||
cache: cache,
|
||||
params: {
|
||||
perpage: 0,
|
||||
all: true,
|
||||
},
|
||||
},
|
||||
delete: {
|
||||
method: 'DELETE',
|
||||
isArray: true,
|
||||
cache: cache,
|
||||
},
|
||||
delete: {method: 'DELETE', isArray: true, cache: cache}
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
static factory($resource, $cacheFactory) {
|
||||
static factory($resource, $cacheFactory) {
|
||||
return new FileService($resource, $cacheFactory);
|
||||
}
|
||||
}
|
||||
|
||||
export class UserService {
|
||||
constructor($resource) {
|
||||
return $resource(window.settings.apiURL + '/user');
|
||||
}
|
||||
constructor($resource) {
|
||||
return $resource(window.settings.apiURL + '/user');
|
||||
}
|
||||
|
||||
static factory($resource) {
|
||||
static factory($resource) {
|
||||
return new UserService($resource);
|
||||
}
|
||||
}
|
||||
|
||||
export class EventService {
|
||||
constructor($rootScope, ReconnectingWebSocket) {
|
||||
if (window.user && WebSocket) {
|
||||
let ws = new ReconnectingWebSocket('wss' + window.settings.apiURL.replace('https', '').replace('http', '') + '/user');
|
||||
ws.onmessage = function (msg) {
|
||||
var evt = JSON.parse(msg.data);
|
||||
constructor($rootScope, ReconnectingWebSocket) {
|
||||
if (window.user && WebSocket) {
|
||||
const ws = new ReconnectingWebSocket('wss' + window.settings.apiURL.replace('https', '').replace('http', '') + '/user');
|
||||
ws.onmessage = (msg) => {
|
||||
const evt = JSON.parse(msg.data);
|
||||
$rootScope.$broadcast(evt.type, evt.data);
|
||||
};
|
||||
ws.onopen = function() {
|
||||
ws.send(JSON.stringify({authorization: window.user.token}));
|
||||
ws.onopen = () => {
|
||||
ws.send(JSON.stringify({
|
||||
authorization: window.user.token,
|
||||
}));
|
||||
};
|
||||
}
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
static factory($rootScope, ReconnectingWebSocket) {
|
||||
return new EventService($rootScope, ReconnectingWebSocket);
|
||||
}
|
||||
static factory($rootScope, ReconnectingWebSocket) {
|
||||
return new EventService($rootScope, ReconnectingWebSocket);
|
||||
}
|
||||
}
|
||||
|
||||
export class TransactionService {
|
||||
constructor ($resource, $cacheFactory) {
|
||||
var cache = $cacheFactory('transaction-cache');
|
||||
return $resource(window.settings.apiURL + '/user/transaction/:id', {id: '@id'}, {
|
||||
query: {method: 'GET', isArray: true, cache: cache}
|
||||
constructor($resource, $cacheFactory) {
|
||||
const cache = $cacheFactory('transaction-cache');
|
||||
return $resource(window.settings.apiURL + '/user/transaction/:id', {
|
||||
id: '@id',
|
||||
}, {
|
||||
query: {
|
||||
method: 'GET',
|
||||
isArray: true,
|
||||
cache: cache,
|
||||
},
|
||||
});
|
||||
}
|
||||
|
||||
static factory($resource, $cacheFactory) {
|
||||
static factory($resource, $cacheFactory) {
|
||||
return new TransactionService($resource, $cacheFactory);
|
||||
}
|
||||
}
|
||||
|
||||
export class SettingService {
|
||||
constructor ($http) {
|
||||
var service = {};
|
||||
service.update = function(data) {
|
||||
constructor($http) {
|
||||
const service = {};
|
||||
service.update = (data) => {
|
||||
return $http.post(window.settings.apiURL + '/user/settings', data);
|
||||
};
|
||||
return service;
|
||||
}
|
||||
|
||||
static factory($http) {
|
||||
static factory($http) {
|
||||
return new SettingService($http);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue