Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .drone.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ clone:

pipeline:
check-app-compatbility:
image: nextcloudci/php7.0:php7.0-17
image: nextcloudci/php7.1:php7.1-15
environment:
- APP_NAME=deck
- CORE_BRANCH=stable15
- CORE_BRANCH=master
- DB=sqlite
commands:
# Pre-setup steps
Expand Down Expand Up @@ -43,7 +43,7 @@ pipeline:
- DB=sqlite
commands:
- composer install
- ./vendor/bin/parallel-lint --exclude ./vendor/ .
- ./vendor/bin/parallel-lint --exclude ./vendor/ --exclude ./lib/Collaboration/ .
when:
matrix:
TESTS: syntax-php7.0
Expand Down
10 changes: 10 additions & 0 deletions css/collections.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
.icon-deck {
background-image: url('../img/deck-dark.svg');
}

.resource-type-deck img {
opacity: 0.4 !important;
}
.resource-type-deck:hover img {
opacity: 0.7 !important;
}
2 changes: 1 addition & 1 deletion css/style.scss
Original file line number Diff line number Diff line change
Expand Up @@ -654,7 +654,7 @@ input.input-inline {
min-height: 16px;
}

.popovermenu {
.popovermenu:not(.action-item__menu) {
z-index: 999;
opacity: 1;
display: block;
Expand Down
28 changes: 27 additions & 1 deletion js/controller/BoardController.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,11 @@
*/

import app from '../app/App.js';
import Vue from 'vue';
import CollaborationView from '../views/CollaborationView';

/* global oc_defaults OC OCP OCA */
app.controller('BoardController', function ($rootScope, $scope, $stateParams, StatusService, BoardService, StackService, CardService, LabelService, $state, $transitions, $filter, FileService) {
app.controller('BoardController', function ($rootScope, $scope, $element, $stateParams, StatusService, BoardService, StackService, CardService, LabelService, $state, $transitions, $filter, FileService) {

$scope.sidebar = $rootScope.sidebar;

Expand Down Expand Up @@ -148,6 +151,29 @@ app.controller('BoardController', function ($rootScope, $scope, $stateParams, St
}
});

const ComponentVM = new Vue({
render: h => h(CollaborationView),
data: {
model: BoardService.getCurrent()
},
});
$scope.mountCollections = function() {
const MountingPoint = document.getElementById('collaborationResources');
if (MountingPoint) {
ComponentVM.model = BoardService.getCurrent();
ComponentVM.$mount(MountingPoint);
}
};
$scope.$$postDigest($scope.mountCollections);
$scope.$watch(function () {
return BoardService.getCurrent();
}, function() {
ComponentVM.model = BoardService.getCurrent();
if ($scope.sidebar.show) {
$scope.$$postDigest($scope.mountCollections);
}
});

$scope.toggleCompactMode = function() {
$rootScope.compactMode = !$rootScope.compactMode;
localStorage.setItem('deck.compactMode', JSON.stringify($rootScope.compactMode));
Expand Down
69 changes: 69 additions & 0 deletions js/init-collections.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
/*
* @copyright Copyright (c) 2019 Julius Härtl <[email protected]>
*
* @author Julius Härtl <[email protected]>
*
* @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/>.
*
*/

'use strict';

/* global __webpack_nonce__ __webpack_public_path__ OC t n */
// eslint-disable-next-line
__webpack_nonce__ = btoa(OC.requestToken);
// eslint-disable-next-line
__webpack_public_path__ = OC.linkTo('deck', 'js/build/');

import Vue from 'vue';
import BoardSelector from './views/BoardSelector';

import './../css/collections.css';

((function(OCP) {

Vue.prototype.$ = $
Vue.prototype.t = t
Vue.prototype.n = n
Vue.prototype.OC = OC

OCP.Collaboration.registerType('deck', {
action: () => {
return new Promise((resolve, reject) => {
const container = document.createElement('div');
container.id = 'deck-board-select';
const body = document.getElementById('body-user');
body.append(container);
const ComponentVM = new Vue({
render: h => h(BoardSelector),
});
ComponentVM.$mount(container);
ComponentVM.$root.$on('close', () => {
ComponentVM.$el.remove();
ComponentVM.$destroy();
reject();
});
ComponentVM.$root.$on('select', (id) => {
resolve(id);
ComponentVM.$el.remove();
ComponentVM.$destroy();
});
});
},
typeString: t('deck', 'board'),
typeIconClass: 'icon-deck'
});
})(window.OCP));
7 changes: 5 additions & 2 deletions js/init.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
'use strict';

/* global __webpack_nonce__ OC */
__webpack_nonce__ = btoa(OC.requestToken); // eslint-disable-line no-native-reassign
/* global __webpack_nonce__ __webpack_public_path__ OC t n */
// eslint-disable-next-line
__webpack_nonce__ = btoa(OC.requestToken);
// eslint-disable-next-line
__webpack_public_path__ = OC.linkTo('deck', 'js/build/');

// used for building a vendor stylesheet
import 'ng-sortable/dist/ng-sortable.css';
Expand Down
Loading