Strona główna Odkrywaj Pomoc
Zarejestruj się Zaloguj się
im-changing.ru
/
converse.js
kopia lustrzana https://github.com/conversejs/converse.js.git
2
0
Forkuj 0
Pliki Problemy 0 Wiki
Przeglądaj źródła

Add a new configuration setting: `root`

JC Brand 7 lat temu
rodzic
50f03c90e1
commit
5517e3554c
15 zmienionych plików z 74 dodań i 29 usunięć
Widok podzielony Pokaż statystyki zmian
  1. 2 1
      CHANGES.md
  2. 29 0
      docs/source/configuration.rst
  3. 1 1
      src/converse-bookmarks.js
  4. 8 3
      src/converse-chatboxes.js
  5. 5 4
      src/converse-chatview.js
  6. 4 4
      src/converse-controlbox.js
  7. 15 8
      src/converse-core.js
  8. 1 1
      src/converse-disco.js
  9. 1 1
      src/converse-dragresize.js
  10. 2 1
      src/converse-fullscreen.js
  11. 1 1
      src/converse-minimize.js
  12. 2 1
      src/converse-otr.js
  13. 1 1
      src/converse-profile.js
  14. 1 1
      src/converse-roomslist.js
  15. 1 1
      src/converse-singleton.js

+ 2 - 1
CHANGES.md
Wyświetl plik 

@@ -17,8 +17,9 @@ though they should be private._
 
 ### API changes
 
 - New API method `_converse.disco.getIdentity` to check whether a JID has a given identity.
 
 
-### New configuration settings
 
+### Configuration settings
 
 - New configuration setting [allow_public_bookmarks](https://conversejs.org/docs/html/configurations.html#allow-public-bookmarks)
 
+- New configuration setting [root](https://conversejs.org/docs/html/configurations.html#root)
 
 
 
 ## 3.3.2 (2018-01-29)

+ 29 - 0
docs/source/configuration.rst
Wyświetl plik 

@@ -1091,6 +1091,35 @@ providers_link
 
 The hyperlink on the registration form which points to a directory of public
 
 XMPP servers.
 
 
+root
 
+----
 
+
 
+* Default: ``window.document``
 
+
 
+When using converse.js inside a web component's shadow DOM, you will need to set this settings'
 
+value to the shadow-root of the shadow DOM.
 
+
 
+For example:
 
+
 
+.. code-block:: javascript
 
+
 
+  class CustomChatComponent extends HTMLElement {
 
+    constructor() {
 
+      super();
 
+      const shadowRoot  = this.attachShadow({mode: "open"});
 
+      this.initConverse(shadowRoot);
 
+    }
 
+
 
+    initConverse(shadowRoot) {
 
+        window.addEventListener("converse-loaded", function(event) {
 
+            converse.initialize({
 
+                root: shadowRoot,
 
+                // Other settings go here...
 
+            });
 
+        });
 
+      }
 
+    }
 
+
 
 
 roster_groups
 
 -------------

+ 1 - 1
src/converse-bookmarks.js
Wyświetl plik 

@@ -478,7 +478,7 @@
 
                 insertIntoControlBox () {
 
                     const controlboxview = _converse.chatboxviews.get('controlbox');
 
                     if (!_.isUndefined(controlboxview) &&
 
-                            !document.body.contains(this.el)) {
 
+                            !_converse.root.contains(this.el)) {
 
                         const container = controlboxview.el.querySelector('#chatrooms');
 
                         if (!_.isNull(container)) {
 
                             container.insertBefore(this.el, container.firstChild);

+ 8 - 3
src/converse-chatboxes.js
Wyświetl plik 

@@ -418,12 +418,17 @@
 
                     * If the #conversejs element doesn't exist, create it.
 
                     */
 
                     if (!this.el) {
 
-                        let el = document.querySelector('#conversejs');
 
+                        let el = _converse.root.querySelector('#conversejs');
 
                         if (_.isNull(el)) {
 
                             el = document.createElement('div');
 
                             el.setAttribute('id', 'conversejs');
 
-                            // Converse.js expects a <body> tag to be present.
 
-                            document.querySelector('body').appendChild(el);
 
+                            const body = _converse.root.querySelector('body');
 
+                            if (body) {
 
+                                body.appendChild(el);
 
+                            } else {
 
+                                // Perhaps inside a web component?
 
+                                _converse.root.appendChild(el);
 
+                            }
 
                         }
 
                         el.innerHTML = '';
 
                         this.setElement(el, false);

+ 5 - 4
src/converse-chatview.js
Wyświetl plik 

@@ -74,15 +74,16 @@
 
             // New functions which don't exist yet can also be added.
 
             //
 
             registerGlobalEventHandlers: function () {
 
+                const { _converse } = this.__super__;
 
                 this.__super__.registerGlobalEventHandlers();
 
-                document.addEventListener(
 
+                _converse.root.addEventListener(
 
                     'click', function (ev) {
 
                         if (_.includes(ev.target.classList, 'toggle-toolbar-menu') ||
 
                             _.includes(ev.target.classList, 'insert-emoji')) {
 
                             return;
 
                         }
 
                         u.slideInAllElements(
 
-                            document.querySelectorAll('.toolbar-menu')
 
+                            _converse.root.querySelectorAll('.toolbar-menu')
 
                         )
 
                     }
 
                 );
 
@@ -430,7 +431,7 @@
 
                      * as well as src/converse-muc.js (if those plugins are
 
                      * enabled).
 
                      */
 
-                    const container = document.querySelector('#conversejs');
 
+                    const container = _converse.root.querySelector('#conversejs');
 
                     if (this.el.parentNode !== container) {
 
                         container.insertBefore(this.el, container.firstChild);
 
                     }
 
@@ -1024,7 +1025,7 @@
 
                         }
 
                     }
 
                     const elements = _.difference(
 
-                        document.querySelectorAll('.toolbar-menu'),
 
+                        _converse.root.querySelectorAll('.toolbar-menu'),
 
                         [this.emoji_picker_view.el]
 
                     );
 
                     u.slideInAllElements(elements)

+ 4 - 4
src/converse-controlbox.js
Wyświetl plik 

@@ -426,8 +426,8 @@
 
                     const tab = ev.target,
 
                         sibling_li = tab.parentNode.nextElementSibling || tab.parentNode.previousElementSibling,
 
                         sibling = sibling_li.firstChild,
 
-                        sibling_panel = document.querySelector(sibling.getAttribute('href')),
 
-                        tab_panel = document.querySelector(tab.getAttribute('href'));
 
+                        sibling_panel = _converse.root.querySelector(sibling.getAttribute('href')),
 
+                        tab_panel = _converse.root.querySelector(tab.getAttribute('href'));
 
 
                     u.hideElement(sibling_panel);
 
                     u.removeClass('current', sibling);
 
@@ -656,7 +656,7 @@
 
                     xhr.onload = function () {
 
                         if (xhr.status >= 200 && xhr.status < 400) {
 
                             const data = JSON.parse(xhr.responseText),
 
-                                  ul = document.querySelector('.search-xmpp ul');
 
+                                  ul = _converse.root.querySelector('.search-xmpp ul');
 
                             u.removeElement(ul.querySelector('li.found-user'));
 
                             u.removeElement(ul.querySelector('li.chat-info'));
 
                             if (!data.length) {
 
@@ -769,7 +769,7 @@
 
 
                 onClick (e) {
 
                     e.preventDefault();
 
-                    if (u.isVisible(document.querySelector("#controlbox"))) {
 
+                    if (u.isVisible(_converse.root.querySelector("#controlbox"))) {
 
                         const controlbox = _converse.chatboxes.get('controlbox');
 
                         if (_converse.connection.connected) {
 
                             controlbox.save({closed: true});

+ 15 - 8
src/converse-core.js
Wyświetl plik 

@@ -4,7 +4,7 @@
 
 // Copyright (c) 2012-2017, Jan-Carel Brand <jc@opkode.com>
 
 // Licensed under the Mozilla Public License (MPLv2)
 
 //
 
-/*global Backbone, define, window, document, JSON */
 
+/*global Backbone, define, window, JSON */
 
 (function (root, factory) {
 
     define(["sizzle",
 
             "es6-promise",
 
@@ -318,6 +318,7 @@
 
             priority: 0,
 
             registration_domain: '',
 
             rid: undefined,
 
+            root: window.document,
 
             roster_groups: true,
 
             show_only_online_users: false,
 
             show_send_button: false,
 
@@ -591,19 +592,25 @@
 
         this.incrementMsgCounter = function () {
 
             this.msg_counter += 1;
 
             const unreadMsgCount = this.msg_counter;
 
-            if (document.title.search(/^Messages \(\d+\) /) === -1) {
 
-                document.title = `Messages (${unreadMsgCount}) ${document.title}`;
 
+            let title = document.title;
 
+            if (_.isNil(title)) {
 
+                return;
 
+            }
 
+            if (title.search(/^Messages \(\d+\) /) === -1) {
 
+                title = `Messages (${unreadMsgCount}) ${title}`;
 
             } else {
 
-                document.title = document.title.replace(
 
-                    /^Messages \(\d+\) /, `Messages (${unreadMsgCount}) `
 
-                );
 
+                title = title.replace(/^Messages \(\d+\) /, `Messages (${unreadMsgCount})`);
 
             }
 
         };
 
 
         this.clearMsgCounter = function () {
 
             this.msg_counter = 0;
 
-            if (document.title.search(/^Messages \(\d+\) /) !== -1) {
 
-                document.title = document.title.replace(/^Messages \(\d+\) /, "");
 
+            let title = document.title;
 
+            if (_.isNil(title)) {
 
+                return;
 
+            }
 
+            if (title.search(/^Messages \(\d+\) /) !== -1) {
 
+                title = title.replace(/^Messages \(\d+\) /, "");
 
             }
 
         };

+ 1 - 1
src/converse-disco.js
Wyświetl plik 

@@ -7,7 +7,7 @@
 
 
 /* This is a Converse.js plugin which add support for XEP-0030: Service Discovery */
 
 
-/*global Backbone, define, window, document */
 
+/*global Backbone, define, window */
 
 (function (root, factory) {
 
     define(["converse-core", "sizzle", "strophe.disco"], factory);
 
 }(this, function (converse, sizzle) {

+ 1 - 1
src/converse-dragresize.js
Wyświetl plik 

@@ -4,7 +4,7 @@
 
 // Copyright (c) 2012-2017, Jan-Carel Brand <jc@opkode.com>
 
 // Licensed under the Mozilla Public License (MPLv2)
 
 //
 
-/*global define, window */
 
+/*global define, window, document */
 
 
 (function (root, factory) {
 
     define(["converse-core",

+ 2 - 1
src/converse-fullscreen.js
Wyświetl plik 

@@ -37,7 +37,8 @@
 
                 },
 
 
                 insertBrandHeading () {
 
-                    const el = document.getElementById('converse-login-panel');
 
+                    const { _converse } = this.__super__;
 
+                    const el = _converse.root.getElementById('converse-login-panel');
 
                     el.parentNode.insertAdjacentHTML(
 
                         'afterbegin',
 
                         this.createBrandHeadingHTML()

+ 1 - 1
src/converse-minimize.js
Wyświetl plik 

@@ -4,7 +4,7 @@
 
 // Copyright (c) 2012-2017, Jan-Carel Brand <jc@opkode.com>
 
 // Licensed under the Mozilla Public License (MPLv2)
 
 //
 
-/*global define, window */
 
+/*global define, window, document */
 
 
 (function (root, factory) {
 
     define(["converse-core",

+ 2 - 1
src/converse-otr.js
Wyświetl plik 

@@ -403,9 +403,10 @@
 
 
                 toggleOTRMenu (ev) {
 
                     ev.stopPropagation();
 
+                    const { _converse } = this.__super__;
 
                     const menu = this.el.querySelector('.toggle-otr ul');
 
                     const elements = _.difference(
 
-                        document.querySelectorAll('.toolbar-menu'),
 
+                        _converse.root.querySelectorAll('.toolbar-menu'),
 
                         [menu]
 
                     );
 
                     utils.slideInAllElements(elements).then(

+ 1 - 1
src/converse-profile.js
Wyświetl plik 

@@ -79,7 +79,7 @@
 
                 toggleOptions (ev) {
 
                     ev.preventDefault();
 
                     utils.slideInAllElements(
 
-                        document.querySelectorAll('#conversejs .contact-form-container')
 
+                        _converse.root.querySelectorAll('#conversejs .contact-form-container')
 
                     );
 
                     utils.slideToggleElement(this.el.querySelector("#target dd ul"));
 
                 },

+ 1 - 1
src/converse-roomslist.js
Wyświetl plik 

@@ -176,7 +176,7 @@
 
                 insertIntoControlBox () {
 
                     const controlboxview = _converse.chatboxviews.get('controlbox');
 
                     if (!_.isUndefined(controlboxview) &&
 
-                            !document.body.contains(this.el)) {
 
+                            !_converse.root.contains(this.el)) {
 
                         const container = controlboxview.el.querySelector('#chatrooms');
 
                         if (!_.isNull(container)) {
 
                             container.insertBefore(this.el, container.firstChild);

+ 1 - 1
src/converse-singleton.js
Wyświetl plik 

@@ -4,7 +4,7 @@
 
 // Copyright (c) 2012-2017, JC Brand <jc@opkode.com>
 
 // Licensed under the Mozilla Public License (MPLv2)
 
 //
 
-/*global Backbone, define, window, document, JSON */
 
+/*global Backbone, define, window, JSON */
 
 
 /* converse-singleton
 
  * ******************