ahtlon/deck
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge branch 'master' into vue-master

Browse Source
This commit is contained in:
Julius Härtl
2019-08-20 10:57:41 +02:00
parent a5ee26a592 c88b25c627
commit 1eeaff7f29
115 changed files with 4880 additions and 1694 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
js/controller/ActivityController.js
View File

@@ -284,7 +284,7 @@ class ActivityController {
parseMessage(activity) {
let subject = activity.subject_rich[0];
let parameters = activity.subject_rich[1];
if (parameters.after && parameters.after.id && parameters.after.id.startsWith('dt:')) {
if (parameters.after && typeof parameters.after.id === 'string' && parameters.after.id.startsWith('dt:')) {
let dateTime = parameters.after.id.substr(3);
parameters.after.name = moment(dateTime).format('L LTS');
}

2
js/init.js
View File

@@ -1,5 +1,7 @@
'use strict';
import "@babel/polyfill";
/* global __webpack_nonce__ __webpack_public_path__ OC t n */
// eslint-disable-next-line
__webpack_nonce__ = btoa(OC.requestToken);

4370
js/package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

36
js/package.json
View File

@@ -14,34 +14,34 @@
"angular-markdown-it": "^0.6.1",
"angular-sanitize": "^1.7.8",
"babel-polyfill": "^6.26.0",
"markdown-it": "^8.4.2",
"markdown-it": "^9.1.0",
"markdown-it-link-target": "^1.0.2",
"nextcloud-axios": "^0.1.3",
"nextcloud-vue": "^0.9.7",
"nextcloud-vue-collections": "^0.4.0",
"nextcloud-axios": "^0.2.0",
"nextcloud-vue": "^0.12.1",
"nextcloud-vue-collections": "^0.5.6",
"ng-infinite-scroll": "^1.3.0",
"ng-sortable": "^1.3.8",
"ui-select": "^0.19.8",
"vue": "^2.6.10",
"vuex": "^3.1.0"
"vuex": "^3.1.1"
},
"devDependencies": {
"@babel/core": "^7.4.3",
"@babel/core": "^7.5.5",
"@babel/plugin-syntax-dynamic-import": "^7.2.0",
"@babel/polyfill": "^7.4.3",
"@babel/preset-env": "^7.4.3",
"babel-loader": "^8.0.5",
"css-loader": "^2.1.1",
"karma": "^4.0.1",
"mini-css-extract-plugin": "^0.6.0",
"style-loader": "^0.23.1",
"uglifyjs-webpack-plugin": "^2.1.2",
"url-loader": "^1.1.2",
"vue-loader": "^15.7.0",
"@babel/polyfill": "^7.4.4",
"@babel/preset-env": "^7.5.5",
"babel-loader": "^8.0.6",
"css-loader": "^3.2.0",
"karma": "^4.2.0",
"mini-css-extract-plugin": "^0.8.0",
"style-loader": "^1.0.0",
"uglifyjs-webpack-plugin": "^2.2.0",
"url-loader": "^2.1.0",
"vue-loader": "^15.7.1",
"vue-style-loader": "^4.1.2",
"vue-template-compiler": "^2.6.10",
"webpack": "^4.29.6",
"webpack-cli": "^3.3.0",
"webpack": "^4.39.2",
"webpack-cli": "^3.3.6",
"webpack-merge": "^4.2.1"
},
"scripts": {

14
js/service/BoardService.js
View File

@@ -4,20 +4,20 @@
* @author Julius Härtl <jus@bitgrid.net>
*
* @license GNU AGPL version 3 or any later version
*
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*
*/
import app from '../app/App.js';
/* global app OC angular */
@@ -172,7 +172,8 @@ app.factory('BoardService', function (ApiService, $http, $q) {
var deferred = $q.defer();
var self = this;
$http.delete(this.baseUrl + '/' + acl.boardId + '/acl/' + acl.id).then(function (response) {
delete board.acl[response.data.id];
var index = board.acl.findIndex((item) => item.id === response.data.id);
delete board.acl[index];
if (response.data.type === OC.Share.SHARE_TYPE_USER) {
self._updateUsers();
} else {
@@ -192,7 +193,8 @@ app.factory('BoardService', function (ApiService, $http, $q) {
var self = this;
var _acl = acl;
$http.put(this.baseUrl + '/' + acl.boardId + '/acl', _acl).then(function (response) {
board.acl[_acl.id] = response.data;
var index = board.acl.findIndex((item) => item.id === _acl.id);
board.acl[index] = response.data;
if (response.data.type === OC.Share.SHARE_TYPE_USER) {
self._updateUsers();
} else {

4
js/service/FileService.js
View File

@@ -80,8 +80,8 @@ export default class FileService {
});
if (typeof existingFile !== 'undefined') {
OC.dialogs.confirm(
`A file with the name ${fileItem.file.name} already exists. Do you want to overwrite it?`,
'File already exists',
t('deck', `A file with the name ${fileItem.file.name} already exists. Do you want to overwrite it?`),
t('deck', 'File already exists'),
function (result) {
if (result) {
self.runUpload(fileItem, existingFile.id);

8
js/views/BoardSelector.vue
View File

@@ -25,7 +25,7 @@
<div id="modal-inner" :class="{ 'icon-loading': loading }">
<h1>{{ t('deck', 'Select the board to link to a project') }}</h1>
<ul v-if="!loading">
<li v-for="board in boards" v-if="currentBoard && ''+board.id !== ''+currentBoard" @click="selectedBoard=board.id" :class="{'selected': (selectedBoard === board.id) }">
<li v-for="board in boards" v-if="!currentBoard || ''+board.id !== ''+currentBoard" @click="selectedBoard=board.id" :class="{'selected': (selectedBoard === board.id) }">
<span class="board-bullet" :style="{ 'backgroundColor': '#' + board.color }"></span>
<span>{{ board.title }}</span>
</li>
@@ -89,8 +89,10 @@
},
beforeMount() {
this.fetchBoards();
if (angular.element('#board')) {
this.currentBoard = angular.element('#board').scope().boardservice.id || null;
if (typeof angular !== 'undefined' && angular.element('#board')) {
try {
this.currentBoard = angular.element('#board').scope().boardservice.id || null;
} catch (e) {}
}
},
methods: {