Signal/Desktop
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Desktop.git synced 2025-12-25 04:36:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move new-style modules to window.Signal namespace

Browse Source
This commit is contained in:
Daniel Gasienica
2018-02-13 14:55:35 -05:00
parent 02c9328877
commit 58eac38301
3 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
js/background.js
View File

@@ -7,6 +7,7 @@
/* global ConversationController: false */
/* global getAccountManager: false */
/* global Signal: false */
/* global storage: false */
/* global textsecure: false */
/* global Whisper: false */
@@ -15,7 +16,7 @@
;(function() {
'use strict';
const { Message } = window.Whisper.Types;
const { Message } = window.Signal.Types;
// Implicitly used in `indexeddb-backbonejs-adapter`:
// https://github.com/signalapp/Signal-Desktop/blob/4033a9f8137e62ed286170ed5d4941982b1d3a64/components/indexeddb-backbonejs-adapter/backbone-indexeddb.js#L569

3
js/models/conversations.js
View File

@@ -1,5 +1,6 @@
/* eslint-disable */
/* global Signal: false */
/* global storage: false */
/* global textsecure: false */
/* global Whisper: false */
@@ -8,7 +9,7 @@
'use strict';
window.Whisper = window.Whisper || {};
const { Attachment, Message } = window.Whisper.Types;
const { Attachment, Message } = window.Signal.Types;
// TODO: Factor out private and group subclasses of Conversation

8
preload.js
View File

@@ -76,10 +76,10 @@
window.autoOrientImage = autoOrientImage;
// ES2015+ modules
window.Whisper = window.Whisper || {};
window.Whisper.Types = window.Whisper.Types || {};
window.Whisper.Types.Attachment = require('./js/modules/types/attachment');
window.Whisper.Types.Message = require('./js/modules/types/message');
window.Signal = window.Signal || {};
window.Signal.Types = window.Signal.Types || {};
window.Signal.Types.Attachment = require('./js/modules/types/attachment');
window.Signal.Types.Message = require('./js/modules/types/message');
// We pull this in last, because the native module involved appears to be sensitive to
// /tmp mounted as noexec on Linux.