diff --git a/.eslintignore b/.eslintignore index a586861bdb..764a4f79a7 100644 --- a/.eslintignore +++ b/.eslintignore @@ -1,6 +1,5 @@ /js/admin/* /js/collections.js -/js/collectionsintegration.js /js/simplewebrtc/bundled.js /js/tests/* /js/vendor/* diff --git a/src/collectionsintegration.js b/src/collectionsintegration.js deleted file mode 100644 index 98fd90ba60..0000000000 --- a/src/collectionsintegration.js +++ /dev/null @@ -1,63 +0,0 @@ -/* - * @copyright Copyright (c) 2019 Julius Härtl - * - * @author Julius Härtl - * - * @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 . - * - */ - -import Vue from 'vue' -import CollaborationView from './views/CollaborationView' - -// eslint-disable-next-line no-unexpected-multiline -(function(OCP, OCA) { - // eslint-disable-next-line - __webpack_nonce__ = btoa(OC.requestToken) - // eslint-disable-next-line - __webpack_public_path__ = OC.linkTo('spreed', 'js/') - - Vue.prototype.t = t - Vue.prototype.n = n - Vue.prototype.OC = OC - - OCA.Talk = Object.assign({}, OCA.Talk) - OCA.Talk.CollectionsTabView = { - - ComponentVM: null, - MountingPoint: null, - - init(MountingPoint, roomModel) { - this.ComponentVM = new Vue({ - data: { - model: roomModel.toJSON(), - }, - render: h => h(CollaborationView), - }) - - if (MountingPoint) { - this.ComponentVM.$mount(MountingPoint) - } - }, - setRoomModel(roomModel) { - if (this.ComponentVM) { - this.ComponentVM.model = roomModel.toJSON() - } - }, - - } - -})(window.OCP, window.OCA) diff --git a/src/components/Sidebar/Sidebar.vue b/src/components/Sidebar/Sidebar.vue index b32e20dd35..9d4fada58d 100644 --- a/src/components/Sidebar/Sidebar.vue +++ b/src/components/Sidebar/Sidebar.vue @@ -24,29 +24,41 @@ v-if="opened" :title="conversation.displayName" :starred.sync="conversation.isFavorite" - @close="show=false" /> + @close="show=false"> + + Participants + + + + + + + diff --git a/src/views/CollaborationView.vue b/src/views/CollaborationView.vue deleted file mode 100644 index 53be819457..0000000000 --- a/src/views/CollaborationView.vue +++ /dev/null @@ -1,55 +0,0 @@ - - - - - diff --git a/webpack.common.js b/webpack.common.js index 210e88ed0e..2f3a5f4704 100644 --- a/webpack.common.js +++ b/webpack.common.js @@ -11,7 +11,6 @@ module.exports = { 'admin/stun-server': path.join(__dirname, 'src', 'StunServerSettings.js'), 'admin/turn-server': path.join(__dirname, 'src', 'TurnServerSettings.js'), 'collections': path.join(__dirname, 'src', 'collections.js'), - 'collectionsintegration': path.join(__dirname, 'src', 'collectionsintegration.js'), 'talk': path.join(__dirname, 'src', 'main.js') }, output: {