JC Brand 6 years ago
parent
commit
0288ef437e
3 changed files with 10 additions and 7 deletions
  1. 1 1
      Makefile
  2. 4 3
      dist/converse.js
  3. 5 3
      src/converse-profile.js

+ 1 - 1
Makefile

@@ -167,7 +167,7 @@ watchjsheadless: dev
 
 
 .PHONY: watch
 .PHONY: watch
 watch: dev
 watch: dev
-	make -j 3 watchcss  watchjsheadless watchjs
+	make -j 2 watchjsheadless watchjs
 
 
 .PHONY: logo
 .PHONY: logo
 logo: logo/conversejs-transparent16.png \
 logo: logo/conversejs-transparent16.png \

+ 4 - 3
dist/converse.js

@@ -58186,7 +58186,8 @@ const _converse$env = _converse_headless_converse_core__WEBPACK_IMPORTED_MODULE_
       Promise = _converse$env.Promise,
       Promise = _converse$env.Promise,
       utils = _converse$env.utils,
       utils = _converse$env.utils,
       _ = _converse$env._,
       _ = _converse$env._,
-      moment = _converse$env.moment;
+      moment = _converse$env.moment,
+      sizzle = _converse$env.sizzle;
 const u = _converse_headless_converse_core__WEBPACK_IMPORTED_MODULE_4__["default"].env.utils;
 const u = _converse_headless_converse_core__WEBPACK_IMPORTED_MODULE_4__["default"].env.utils;
 _converse_headless_converse_core__WEBPACK_IMPORTED_MODULE_4__["default"].plugins.add('converse-profile', {
 _converse_headless_converse_core__WEBPACK_IMPORTED_MODULE_4__["default"].plugins.add('converse-profile', {
   dependencies: ["converse-modal", "converse-vcard", "converse-chatboxviews"],
   dependencies: ["converse-modal", "converse-vcard", "converse-chatboxviews"],
@@ -58237,7 +58238,7 @@ _converse_headless_converse_core__WEBPACK_IMPORTED_MODULE_4__["default"].plugins
           'label_jid': __('XMPP Address (JID)'),
           'label_jid': __('XMPP Address (JID)'),
           'label_nickname': __('Nickname'),
           'label_nickname': __('Nickname'),
           'label_role': __('Role'),
           'label_role': __('Role'),
-          'label_role_help': __('Use commas to separate multiple roles. Your roles are shown next to your name on your chat messages.'),
+          'label_role_help': __('Use commas to separate multiple roles. ' + 'Your roles are shown next to your name on your chat messages.'),
           'label_url': __('URL'),
           'label_url': __('URL'),
           'utils': u,
           'utils': u,
           'view': this
           'view': this
@@ -58245,7 +58246,7 @@ _converse_headless_converse_core__WEBPACK_IMPORTED_MODULE_4__["default"].plugins
       },
       },
 
 
       afterRender() {
       afterRender() {
-        this.tabs = _.map(this.el.querySelectorAll('.nav-item'), tab => new bootstrap_native__WEBPACK_IMPORTED_MODULE_3___default.a.Tab(tab));
+        this.tabs = sizzle('.nav-item .nav-link', this.el).map(e => new bootstrap_native__WEBPACK_IMPORTED_MODULE_3___default.a.Tab(e));
       },
       },
 
 
       openFileSelection(ev) {
       openFileSelection(ev) {

+ 5 - 3
src/converse-profile.js

@@ -18,7 +18,7 @@ import tpl_profile_view from "templates/profile_view.html";
 import tpl_status_option from "templates/status_option.html";
 import tpl_status_option from "templates/status_option.html";
 
 
 
 
-const { Strophe, Backbone, Promise, utils, _, moment } = converse.env;
+const { Strophe, Backbone, Promise, utils, _, moment, sizzle } = converse.env;
 const u = converse.env.utils;
 const u = converse.env.utils;
 
 
 
 
@@ -72,7 +72,9 @@ converse.plugins.add('converse-profile', {
                     'label_jid': __('XMPP Address (JID)'),
                     'label_jid': __('XMPP Address (JID)'),
                     'label_nickname': __('Nickname'),
                     'label_nickname': __('Nickname'),
                     'label_role': __('Role'),
                     'label_role': __('Role'),
-                    'label_role_help': __('Use commas to separate multiple roles. Your roles are shown next to your name on your chat messages.'),
+                    'label_role_help': __(
+                        'Use commas to separate multiple roles. '+
+                        'Your roles are shown next to your name on your chat messages.'),
                     'label_url': __('URL'),
                     'label_url': __('URL'),
                     'utils': u,
                     'utils': u,
                     'view': this
                     'view': this
@@ -80,7 +82,7 @@ converse.plugins.add('converse-profile', {
             },
             },
 
 
             afterRender () {
             afterRender () {
-                this.tabs = _.map(this.el.querySelectorAll('.nav-item'), (tab) => new bootstrap.Tab(tab));
+                this.tabs = sizzle('.nav-item .nav-link', this.el).map(e => new bootstrap.Tab(e));
             },
             },
 
 
             openFileSelection (ev) {
             openFileSelection (ev) {