Pārlūkot izejas kodu

Bugfix. Declare converse-modal as a dependency of converse-message-view

Otherwise we get `TypeError: Cannot read property 'extend' of undefined`
when attempting to extend `BootstrapModal`.
JC Brand 6 gadi atpakaļ
vecāks
revīzija
f974c79acf
4 mainītis faili ar 5 papildinājumiem un 2 dzēšanām
  1. 1 0
      CHANGES.md
  2. 2 1
      dist/converse.js
  3. 2 0
      src/converse-message-view.js
  4. 0 1
      src/headless/converse-core.js

+ 1 - 0
CHANGES.md

@@ -2,6 +2,7 @@
 
 
 ## 4.0.5 (Unreleased)
 ## 4.0.5 (Unreleased)
 
 
+- `FATAL: TypeError: Cannot read property 'extend' of undefined` when using `embedded` view mode.
 
 
 ## 4.0.4 (2018-10-29)
 ## 4.0.4 (2018-10-29)
 
 

+ 2 - 1
dist/converse.js

@@ -61597,6 +61597,8 @@ const _converse$env = _converse_headless_converse_core__WEBPACK_IMPORTED_MODULE_
       _ = _converse$env._,
       _ = _converse$env._,
       moment = _converse$env.moment;
       moment = _converse$env.moment;
 _converse_headless_converse_core__WEBPACK_IMPORTED_MODULE_0__["default"].plugins.add('converse-message-view', {
 _converse_headless_converse_core__WEBPACK_IMPORTED_MODULE_0__["default"].plugins.add('converse-message-view', {
+  dependencies: ["converse-modal"],
+
   initialize() {
   initialize() {
     /* The initialize function gets called as soon as the plugin is
     /* The initialize function gets called as soon as the plugin is
      * loaded by converse.js's plugin machinery.
      * loaded by converse.js's plugin machinery.
@@ -73339,7 +73341,6 @@ const converse = {
    *
    *
    * @example
    * @example
    * converse.initialize({
    * converse.initialize({
-   *     allow_otr: true,
    *     auto_list_rooms: false,
    *     auto_list_rooms: false,
    *     auto_subscribe: false,
    *     auto_subscribe: false,
    *     bosh_service_url: 'https://bind.example.com',
    *     bosh_service_url: 'https://bind.example.com',

+ 2 - 0
src/converse-message-view.js

@@ -20,6 +20,8 @@ const { Backbone, _, moment } = converse.env;
 
 
 converse.plugins.add('converse-message-view', {
 converse.plugins.add('converse-message-view', {
 
 
+    dependencies: ["converse-modal"],
+
     initialize () {
     initialize () {
         /* The initialize function gets called as soon as the plugin is
         /* The initialize function gets called as soon as the plugin is
          * loaded by converse.js's plugin machinery.
          * loaded by converse.js's plugin machinery.

+ 0 - 1
src/headless/converse-core.js

@@ -1660,7 +1660,6 @@ const converse = {
      *
      *
      * @example
      * @example
      * converse.initialize({
      * converse.initialize({
-     *     allow_otr: true,
      *     auto_list_rooms: false,
      *     auto_list_rooms: false,
      *     auto_subscribe: false,
      *     auto_subscribe: false,
      *     bosh_service_url: 'https://bind.example.com',
      *     bosh_service_url: 'https://bind.example.com',