浏览代码

Editions in PR

master
Ilya Daynatovich 8 年前
父节点
当前提交
62713bf87c
共有 3 个文件被更改,包括 5 次插入10 次删除
  1. 1
    1
      modules/UI/invite/Invite.js
  2. 4
    2
      modules/UI/invite/RequirePasswordDialog.js
  3. 0
    7
      modules/UI/util/MessageHandler.js

+ 1
- 1
modules/UI/invite/Invite.js 查看文件

68
                     // will be marked as locked.
68
                     // will be marked as locked.
69
                     if (!pass)
69
                     if (!pass)
70
                         this.setLockedFromElsewhere(false);
70
                         this.setLockedFromElsewhere(false);
71
-                    this.conference.join(roomLocker.password);
71
+                    this.conference.join(pass);
72
                 });
72
                 });
73
             });
73
             });
74
     }
74
     }

+ 4
- 2
modules/UI/invite/RequirePasswordDialog.js 查看文件

76
             let submitFunction = this._submitFunction.bind(this);
76
             let submitFunction = this._submitFunction.bind(this);
77
             let closeFunction = this._closeFunction.bind(this);
77
             let closeFunction = this._closeFunction.bind(this);
78
 
78
 
79
-            APP.UI.messageHandler.openTwoButtonDialog({
79
+            this._dialog = APP.UI.messageHandler.openTwoButtonDialog({
80
                 titleKey,
80
                 titleKey,
81
                 msgString,
81
                 msgString,
82
                 leftButtonKey: "dialog.Ok",
82
                 leftButtonKey: "dialog.Ok",
153
      * Close the dialog
153
      * Close the dialog
154
      */
154
      */
155
     close() {
155
     close() {
156
-        APP.UI.messageHandler.closeDialog();
156
+        if (this._dialog) {
157
+            this._dialog.close();
158
+        }
157
         this.isOpened = false;
159
         this.isOpened = false;
158
     }
160
     }
159
 }
161
 }

+ 0
- 7
modules/UI/util/MessageHandler.js 查看文件

338
         };
338
         };
339
     },
339
     },
340
 
340
 
341
-    /**
342
-     * Closes currently opened dialog.
343
-     */
344
-    closeDialog: function () {
345
-        $.prompt.close();
346
-    },
347
-
348
     /**
341
     /**
349
      * Shows a dialog with different states to the user.
342
      * Shows a dialog with different states to the user.
350
      *
343
      *

正在加载...
取消
保存