Add `Whisper.Types` namespace
This avoids namespace collision for `Whisper.Message`.
This commit is contained in:
parent
785a949fce
commit
8ad0b066a3
|
@ -19,7 +19,7 @@
|
||||||
;(function() {
|
;(function() {
|
||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
const { Attachment } = window.Whisper;
|
const { Attachment } = window.Whisper.Types;
|
||||||
|
|
||||||
// Implicitly used in `indexeddb-backbonejs-adapter`:
|
// Implicitly used in `indexeddb-backbonejs-adapter`:
|
||||||
// https://github.com/signalapp/Signal-Desktop/blob/4033a9f8137e62ed286170ed5d4941982b1d3a64/components/indexeddb-backbonejs-adapter/backbone-indexeddb.js#L569
|
// https://github.com/signalapp/Signal-Desktop/blob/4033a9f8137e62ed286170ed5d4941982b1d3a64/components/indexeddb-backbonejs-adapter/backbone-indexeddb.js#L569
|
||||||
|
|
|
@ -10,7 +10,7 @@
|
||||||
'use strict';
|
'use strict';
|
||||||
window.Whisper = window.Whisper || {};
|
window.Whisper = window.Whisper || {};
|
||||||
|
|
||||||
const { Attachment } = window.Whisper;
|
const { Attachment } = window.Whisper.Types;
|
||||||
|
|
||||||
// TODO: Factor out private and group subclasses of Conversation
|
// TODO: Factor out private and group subclasses of Conversation
|
||||||
|
|
||||||
|
|
|
@ -9,8 +9,6 @@
|
||||||
'use strict';
|
'use strict';
|
||||||
window.Whisper = window.Whisper || {};
|
window.Whisper = window.Whisper || {};
|
||||||
|
|
||||||
const {Attachment} = window.Whisper;
|
|
||||||
|
|
||||||
Whisper.FileSizeToast = Whisper.ToastView.extend({
|
Whisper.FileSizeToast = Whisper.ToastView.extend({
|
||||||
templateName: 'file-size-modal',
|
templateName: 'file-size-modal',
|
||||||
render_attributes: function() {
|
render_attributes: function() {
|
||||||
|
|
|
@ -77,7 +77,8 @@
|
||||||
|
|
||||||
// ES2015+ modules
|
// ES2015+ modules
|
||||||
window.Whisper = window.Whisper || {};
|
window.Whisper = window.Whisper || {};
|
||||||
window.Whisper.Attachment = require('./js/modules/types/attachment');
|
window.Whisper.Types = window.Whisper.Types || {};
|
||||||
|
window.Whisper.Types.Attachment = require('./js/modules/types/attachment');
|
||||||
|
|
||||||
// We pull this in last, because the native module involved appears to be sensitive to
|
// We pull this in last, because the native module involved appears to be sensitive to
|
||||||
// /tmp mounted as noexec on Linux.
|
// /tmp mounted as noexec on Linux.
|
||||||
|
|
Loading…
Reference in New Issue