Merge pull request #4169 from vector-im/t3chguy/random_fix_1

add explicit import to utf8 polyfill and rip out unused imports
This commit is contained in:
Matthew Hodgson 2017-06-08 15:58:58 +01:00 committed by GitHub
commit 7b4be59e0e
3 changed files with 1 additions and 3 deletions

View file

@ -76,6 +76,7 @@
"react-dom": "^15.4.0", "react-dom": "^15.4.0",
"react-gemini-scrollbar": "matrix-org/react-gemini-scrollbar#5e97aef", "react-gemini-scrollbar": "matrix-org/react-gemini-scrollbar#5e97aef",
"sanitize-html": "^1.11.1", "sanitize-html": "^1.11.1",
"text-encoding-utf-8": "^1.0.1",
"ua-parser-js": "^0.7.10", "ua-parser-js": "^0.7.10",
"url": "^0.11.0", "url": "^0.11.0",
"velocity-vector": "vector-im/velocity#059e3b2" "velocity-vector": "vector-im/velocity#059e3b2"

View file

@ -18,8 +18,6 @@ limitations under the License.
'use strict'; 'use strict';
import React from 'react'; import React from 'react';
import MatrixClientPeg from 'matrix-react-sdk/lib/MatrixClientPeg';
import sdk from 'matrix-react-sdk';
import GeminiScrollbar from 'react-gemini-scrollbar'; import GeminiScrollbar from 'react-gemini-scrollbar';
import request from 'browser-request'; import request from 'browser-request';
import { _t } from 'matrix-react-sdk/lib/languageHandler'; import { _t } from 'matrix-react-sdk/lib/languageHandler';

View file

@ -20,7 +20,6 @@ import React from 'react';
import {DragSource} from 'react-dnd'; import {DragSource} from 'react-dnd';
import {DropTarget} from 'react-dnd'; import {DropTarget} from 'react-dnd';
import dis from 'matrix-react-sdk/lib/dispatcher';
import MatrixClientPeg from 'matrix-react-sdk/lib/MatrixClientPeg'; import MatrixClientPeg from 'matrix-react-sdk/lib/MatrixClientPeg';
import sdk from 'matrix-react-sdk'; import sdk from 'matrix-react-sdk';
import { _t } from 'matrix-react-sdk/lib/languageHandler'; import { _t } from 'matrix-react-sdk/lib/languageHandler';