Browse Source

Move relevant files into converse-rootview plugin folder

JC Brand 4 years ago
parent
commit
6d01a3153e

+ 0 - 2
src/converse.js

@@ -35,8 +35,6 @@ import "./plugins/rosterview/index.js";
 import "./plugins/singleton.js";
 import "./plugins/singleton.js";
 /* END: Removable components */
 /* END: Removable components */
 
 
-import "./components/converse.js";
-
 import { _converse, converse } from "@converse/headless/core";
 import { _converse, converse } from "@converse/headless/core";
 import { CustomElement } from 'components/element';
 import { CustomElement } from 'components/element';
 
 

+ 0 - 1
src/plugins/chatboxviews/index.js

@@ -5,7 +5,6 @@
  */
  */
 import './view.js';
 import './view.js';
 import '@converse/headless/plugins/chatboxes/index.js';
 import '@converse/headless/plugins/chatboxes/index.js';
-import 'components/converse.js';
 import ChatBoxViews from './container.js';
 import ChatBoxViews from './container.js';
 import { ViewWithAvatar } from 'shared/avatar.js';
 import { ViewWithAvatar } from 'shared/avatar.js';
 import { _converse, api, converse } from '@converse/headless/core';
 import { _converse, api, converse } from '@converse/headless/core';

+ 4 - 23
src/plugins/rootview/index.js

@@ -1,31 +1,12 @@
+import './root.js';
 import { api, converse } from '@converse/headless/core';
 import { api, converse } from '@converse/headless/core';
+import { ensureElement } from './utils.js';
 
 
-const u = converse.env.utils;
-
-function ensureElement () {
-    if (!api.settings.get('auto_insert')) {
-        return;
-    }
-    const root = api.settings.get('root');
-    if (!root.querySelector('converse-root#conversejs')) {
-        const el = document.createElement('converse-root');
-        el.setAttribute('id', 'conversejs');
-        u.addClass(`theme-${api.settings.get('theme')}`, el);
-        const body = root.querySelector('body');
-        if (body) {
-            body.appendChild(el);
-        } else {
-            root.appendChild(el); // Perhaps inside a web component?
-        }
-    }
-}
 
 
 converse.plugins.add('converse-rootview', {
 converse.plugins.add('converse-rootview', {
-    initialize () {
-        api.settings.extend({
-            'auto_insert': true
-        });
 
 
+    initialize () {
+        api.settings.extend({ 'auto_insert': true });
         api.listen.on('chatBoxesInitialized', ensureElement);
         api.listen.on('chatBoxesInitialized', ensureElement);
     }
     }
 });
 });

+ 3 - 3
src/components/converse.js → src/plugins/rootview/root.js

@@ -1,6 +1,6 @@
-import tpl_converse from "../templates/converse.js";
+import tpl_root from "./templates/root.js";
 import { api } from '@converse/headless/core';
 import { api } from '@converse/headless/core';
-import { CustomElement } from './element.js';
+import { CustomElement } from 'components/element.js';
 
 
 
 
 /**
 /**
@@ -13,7 +13,7 @@ import { CustomElement } from './element.js';
 class ConverseRoot extends CustomElement {
 class ConverseRoot extends CustomElement {
 
 
     render () { // eslint-disable-line class-methods-use-this
     render () { // eslint-disable-line class-methods-use-this
-        return tpl_converse();
+        return tpl_root();
     }
     }
 
 
     connectedCallback () {
     connectedCallback () {

+ 1 - 1
src/templates/converse.js → src/plugins/rootview/templates/root.js

@@ -1,4 +1,4 @@
-import '../components/font-awesome.js';
+import 'components/font-awesome.js';
 import { api } from '@converse/headless/core';
 import { api } from '@converse/headless/core';
 import { html } from 'lit-html';
 import { html } from 'lit-html';
 
 

+ 21 - 0
src/plugins/rootview/utils.js

@@ -0,0 +1,21 @@
+import { api, converse } from '@converse/headless/core';
+
+const u = converse.env.utils;
+
+export function ensureElement () {
+    if (!api.settings.get('auto_insert')) {
+        return;
+    }
+    const root = api.settings.get('root');
+    if (!root.querySelector('converse-root#conversejs')) {
+        const el = document.createElement('converse-root');
+        el.setAttribute('id', 'conversejs');
+        u.addClass(`theme-${api.settings.get('theme')}`, el);
+        const body = root.querySelector('body');
+        if (body) {
+            body.appendChild(el);
+        } else {
+            root.appendChild(el); // Perhaps inside a web component?
+        }
+    }
+}

+ 0 - 31
src/plugins/rootview/view.js

@@ -1,31 +0,0 @@
-import { api, converse } from '@converse/headless/converse-core';
-
-const u = converse.env.utils;
-
-converse.plugins.add('converse-rootview', {
-    initialize () {
-        api.settings.extend({
-            'auto_insert': true
-        });
-
-        function ensureElement () {
-            if (!api.settings.get('auto_insert')) {
-                return;
-            }
-            const root = api.settings.get('root');
-            if (!root.querySelector('converse-root#conversejs')) {
-                const el = document.createElement('converse-root');
-                el.setAttribute('id', 'conversejs');
-                u.addClass(`theme-${api.settings.get('theme')}`, el);
-                const body = root.querySelector('body');
-                if (body) {
-                    body.appendChild(el);
-                } else {
-                    root.appendChild(el); // Perhaps inside a web component?
-                }
-            }
-        }
-
-        api.listen.on('chatBoxesInitialized', ensureElement);
-    }
-});