Browse Source

More fixing up of paths, requires etc

pull/190/head
David Baker 7 years ago
parent
commit
b11abae8e8
  1. 2
      src/Avatar.js
  2. 10
      src/CallHandler.js
  3. 20
      src/controllers/atoms/ImageView.js
  4. 2
      src/skins/vector/views/atoms/ImageView.js
  5. 4
      src/skins/vector/views/molecules/BottomLeftMenu.js
  6. 4
      src/skins/vector/views/molecules/ContextualMenu.js
  7. 8
      src/skins/vector/views/molecules/EventAsTextTile.js
  8. 2
      src/skins/vector/views/molecules/MFileTile.js
  9. 4
      src/skins/vector/views/molecules/MImageTile.js
  10. 4
      src/skins/vector/views/molecules/MRoomMemberTile.js
  11. 2
      src/skins/vector/views/molecules/MemberInfo.js
  12. 6
      src/skins/vector/views/molecules/MemberTile.js
  13. 4
      src/skins/vector/views/molecules/MessageComposer.js
  14. 2
      src/skins/vector/views/molecules/MessageTile.js
  15. 2
      src/skins/vector/views/molecules/RoomCreate.js
  16. 2
      src/skins/vector/views/molecules/RoomDropTarget.js
  17. 2
      src/skins/vector/views/molecules/RoomHeader.js
  18. 2
      src/skins/vector/views/molecules/RoomSettings.js
  19. 2
      src/skins/vector/views/molecules/RoomTile.js
  20. 2
      src/skins/vector/views/molecules/ServerConfig.js
  21. 2
      src/skins/vector/views/molecules/voip/CallView.js
  22. 4
      src/skins/vector/views/molecules/voip/IncomingCallBox.js
  23. 2
      src/skins/vector/views/molecules/voip/VideoView.js
  24. 2
      src/skins/vector/views/organisms/CreateRoom.js
  25. 10
      src/skins/vector/views/organisms/Notifier.js
  26. 6
      src/skins/vector/views/organisms/RoomDirectory.js
  27. 2
      src/skins/vector/views/organisms/RoomView.js
  28. 4
      src/skins/vector/views/organisms/UserSettings.js
  29. 2
      src/skins/vector/views/pages/MatrixChat.js
  30. 2
      src/skins/vector/views/templates/Login.js
  31. 2
      vector/fonts
  32. 2
      vector/img

2
src/Avatar.js

@ -16,7 +16,7 @@ limitations under the License.
'use strict';
var MatrixClientPeg = require('./MatrixClientPeg');
var MatrixClientPeg = require('matrix-react-sdk/lib/MatrixClientPeg');
module.exports = {
avatarUrlForMember: function(member, width, height, resizeMethod) {

10
src/CallHandler.js

@ -53,10 +53,9 @@ limitations under the License.
* }
*/
var MatrixClientPeg = require("./MatrixClientPeg");
var Modal = require("./Modal");
var ComponentBroker = require('./ComponentBroker');
var ErrorDialog = ComponentBroker.get("organisms/ErrorDialog");
var MatrixClientPeg = require("matrix-react-sdk/lib/MatrixClientPeg");
var Modal = require("matrix-react-sdk/lib/Modal");
var sdk = require('matrix-react-sdk');
var ConferenceCall = require("./ConferenceHandler").ConferenceCall;
var ConferenceHandler = require("./ConferenceHandler");
var Matrix = require("matrix-js-sdk");
@ -118,6 +117,7 @@ function _setCallListeners(call) {
_setCallState(call, call.roomId, "busy");
pause("ringbackAudio");
play("busyAudio");
var ErrorDialog = sdk.getComponent("organisms.ErrorDialog");
Modal.createDialog(ErrorDialog, {
title: "Call Timeout",
description: "The remote side failed to pick up."
@ -278,4 +278,4 @@ module.exports = {
}
return null;
}
};
};

20
src/controllers/atoms/ImageView.js

@ -0,0 +1,20 @@
/*
Copyright 2015 OpenMarket Ltd
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
'use strict';
module.exports = {
};

2
src/skins/vector/views/atoms/ImageView.js

@ -18,7 +18,7 @@ limitations under the License.
var React = require('react');
var ImageViewController = require('matrix-react-sdk/lib/controllers/atoms/ImageView')
var ImageViewController = require('../../../../controllers/atoms/ImageView')
module.exports = React.createClass({
displayName: 'ImageView',

4
src/skins/vector/views/molecules/BottomLeftMenu.js

@ -19,9 +19,9 @@ limitations under the License.
var React = require('react');
var classNames = require('classnames');
var dis = require("../../../../src/dispatcher");
var dis = require('matrix-react-sdk/lib/dispatcher');
var MatrixClientPeg = require("../../../../src/MatrixClientPeg");
var MatrixClientPeg = require('matrix-react-sdk/lib/MatrixClientPeg');
module.exports = React.createClass({
displayName: 'BottomLeftMenu',

4
src/skins/vector/views/molecules/ContextualMenu.js

@ -19,9 +19,9 @@ limitations under the License.
var React = require('react');
var classNames = require('classnames');
var dis = require("../../../../src/dispatcher");
var dis = require('matrix-react-sdk/lib/dispatcher');
var MatrixClientPeg = require("../../../../src/MatrixClientPeg");
var MatrixClientPeg = require('matrix-react-sdk/lib/MatrixClientPeg');
module.exports = React.createClass({
displayName: 'ContextualMenu',

8
src/skins/vector/views/molecules/EventAsTextTile.js

@ -18,12 +18,10 @@ limitations under the License.
var React = require('react');
var MatrixClientPeg = require("../../../../src/MatrixClientPeg");
var MatrixClientPeg = require('matrix-react-sdk/lib/MatrixClientPeg');
var EventAsTextTileController = require('matrix-react-sdk/lib/controllers/molecules/EventAsTextTile')
var sdk = require('matrix-react-sdk')
var MessageTimestamp = ComponentBroker.get('atoms/MessageTimestamp');
var MemberAvatar = ComponentBroker.get('atoms/MemberAvatar');
var TextForEvent = require("../../../../src/TextForEvent");
var TextForEvent = require('matrix-react-sdk/lib/TextForEvent');
module.exports = React.createClass({
displayName: 'EventAsTextTile',
@ -36,6 +34,8 @@ module.exports = React.createClass({
var text = TextForEvent.textForEvent(this.props.mxEvent);
if (text == null || text.length == 0) return null;
var MessageTimestamp = sdk.getComponent('atoms.MessageTimestamp');
var MemberAvatar = sdk.getComponent('atoms.MemberAvatar');
var timestamp = this.props.last ? <MessageTimestamp ts={this.props.mxEvent.getTs()} /> : null;
var avatar = this.props.mxEvent.sender ? <MemberAvatar member={this.props.mxEvent.sender} /> : null;
return (

2
src/skins/vector/views/molecules/MFileTile.js

@ -20,7 +20,7 @@ var React = require('react');
var MFileTileController = require('matrix-react-sdk/lib/controllers/molecules/MFileTile')
var MatrixClientPeg = require('../../../../src/MatrixClientPeg');
var MatrixClientPeg = require('matrix-react-sdk/lib/MatrixClientPeg');
module.exports = React.createClass({
displayName: 'MFileTile',

4
src/skins/vector/views/molecules/MImageTile.js

@ -21,8 +21,8 @@ var filesize = require('filesize');
var MImageTileController = require('matrix-react-sdk/lib/controllers/molecules/MImageTile')
var MatrixClientPeg = require('../../../../src/MatrixClientPeg');
var Modal = require('../../../../src/Modal');
var MatrixClientPeg = require('matrix-react-sdk/lib/MatrixClientPeg');
var Modal = require('matrix-react-sdk/lib/Modal');
var sdk = require('matrix-react-sdk')
module.exports = React.createClass({

4
src/skins/vector/views/molecules/MRoomMemberTile.js

@ -20,9 +20,9 @@ var React = require('react');
var MRoomMemberTileController = require('matrix-react-sdk/lib/controllers/molecules/MRoomMemberTile')
var MatrixClientPeg = require("../../../../src/MatrixClientPeg");
var MatrixClientPeg = require('matrix-react-sdk/lib/MatrixClientPeg');
var sdk = require('matrix-react-sdk')
var TextForEvent = require('../../../../src/TextForEvent');
var TextForEvent = require('matrix-react-sdk/lib/TextForEvent');
module.exports = React.createClass({
displayName: 'MRoomMemberTile',

2
src/skins/vector/views/molecules/MemberInfo.js

@ -18,7 +18,7 @@ limitations under the License.
var React = require('react');
var MatrixClientPeg = require("../../../../src/MatrixClientPeg");
var MatrixClientPeg = require('matrix-react-sdk/lib/MatrixClientPeg');
var MemberInfoController = require('matrix-react-sdk/lib/controllers/molecules/MemberInfo')
module.exports = React.createClass({

6
src/skins/vector/views/molecules/MemberTile.js

@ -18,10 +18,10 @@ limitations under the License.
var React = require('react');
var MatrixClientPeg = require("../../../../src/MatrixClientPeg");
var MatrixClientPeg = require('matrix-react-sdk/lib/MatrixClientPeg');
var sdk = require('matrix-react-sdk')
var Modal = require("../../../../src/Modal");
var ContextualMenu = require("../../../../src/ContextualMenu");
var Modal = require('matrix-react-sdk/lib/Modal');
var ContextualMenu = require('../../../../ContextualMenu');
var MemberTileController = require('matrix-react-sdk/lib/controllers/molecules/MemberTile')
// The Lato WOFF doesn't include sensible combining diacritics, so Chrome chokes on rendering them.

4
src/skins/vector/views/molecules/MessageComposer.js

@ -18,9 +18,9 @@ limitations under the License.
var React = require('react');
var MatrixClientPeg = require("../../../../src/MatrixClientPeg");
var MatrixClientPeg = require('matrix-react-sdk/lib/MatrixClientPeg');
var MessageComposerController = require('matrix-react-sdk/lib/controllers/molecules/MessageComposer')
var ContentMessages = require("../../../../src/ContentMessages");
var ContentMessages = require('matrix-react-sdk/lib/ContentMessages');
var sdk = require('matrix-react-sdk')

2
src/skins/vector/views/molecules/MessageTile.js

@ -20,7 +20,7 @@ var React = require('react');
var classNames = require("classnames");
var MatrixClientPeg = require("../../../../src/MatrixClientPeg");
var MatrixClientPeg = require('matrix-react-sdk/lib/MatrixClientPeg');
var sdk = require('matrix-react-sdk')
var MessageTileController = require('matrix-react-sdk/lib/controllers/molecules/MessageTile')

2
src/skins/vector/views/molecules/RoomCreate.js

@ -21,7 +21,7 @@ var classNames = require('classnames');
//var RoomCreateController = require('matrix-react-sdk/lib/controllers/molecules/RoomCreateController')
var MatrixClientPeg = require("../../../../src/MatrixClientPeg");
var MatrixClientPeg = require('matrix-react-sdk/lib/MatrixClientPeg');
module.exports = React.createClass({
displayName: 'RoomCreate',

2
src/skins/vector/views/molecules/RoomDropTarget.js

@ -21,7 +21,7 @@ var classNames = require('classnames');
//var RoomDropTargetController = require('matrix-react-sdk/lib/controllers/molecules/RoomDropTargetController')
var MatrixClientPeg = require("../../../../src/MatrixClientPeg");
var MatrixClientPeg = require('matrix-react-sdk/lib/MatrixClientPeg');
module.exports = React.createClass({
displayName: 'RoomDropTarget',

2
src/skins/vector/views/molecules/RoomHeader.js

@ -19,7 +19,7 @@ limitations under the License.
var React = require('react');
var sdk = require('matrix-react-sdk')
var MatrixClientPeg = require("../../../../src/MatrixClientPeg");
var MatrixClientPeg = require('matrix-react-sdk/lib/MatrixClientPeg');
var RoomHeaderController = require('matrix-react-sdk/lib/controllers/molecules/RoomHeader')
module.exports = React.createClass({

2
src/skins/vector/views/molecules/RoomSettings.js

@ -17,7 +17,7 @@ limitations under the License.
'use strict';
var React = require('react');
var MatrixClientPeg = require("../../../../src/MatrixClientPeg");
var MatrixClientPeg = require('matrix-react-sdk/lib/MatrixClientPeg');
var RoomSettingsController = require('matrix-react-sdk/lib/controllers/molecules/RoomSettings')

2
src/skins/vector/views/molecules/RoomTile.js

@ -21,7 +21,7 @@ var classNames = require('classnames');
var RoomTileController = require('matrix-react-sdk/lib/controllers/molecules/RoomTile')
var MatrixClientPeg = require("../../../../src/MatrixClientPeg");
var MatrixClientPeg = require('matrix-react-sdk/lib/MatrixClientPeg');
var sdk = require('matrix-react-sdk')

2
src/skins/vector/views/molecules/ServerConfig.js

@ -17,7 +17,7 @@ limitations under the License.
'use strict';
var React = require('react');
var Modal = require('../../../../src/Modal');
var Modal = require('matrix-react-sdk/lib/Modal');
var sdk = require('matrix-react-sdk')
var ServerConfigController = require('matrix-react-sdk/lib/controllers/molecules/ServerConfig')

2
src/skins/vector/views/molecules/voip/CallView.js

@ -18,7 +18,7 @@ limitations under the License.
var React = require('react');
var MatrixClientPeg = require("../../../../../src/MatrixClientPeg");
var MatrixClientPeg = require('matrix-react-sdk/lib/MatrixClientPeg');
var sdk = require('matrix-react-sdk')
var CallViewController = require(
"matrix-react-sdk/lib/controllers/molecules/voip/CallView"

4
src/skins/vector/views/molecules/voip/IncomingCallBox.js

@ -17,9 +17,9 @@ limitations under the License.
'use strict';
var React = require('react');
var MatrixClientPeg = require("../../../../../src/MatrixClientPeg");
var MatrixClientPeg = require('matrix-react-sdk/lib/MatrixClientPeg');
var IncomingCallBoxController = require(
"../../../../../src/controllers/molecules/voip/IncomingCallBox"
"matrix-react-sdk/lib/controllers/molecules/voip/IncomingCallBox"
);
module.exports = React.createClass({

2
src/skins/vector/views/molecules/voip/VideoView.js

@ -18,7 +18,7 @@ limitations under the License.
var React = require('react');
var MatrixClientPeg = require("../../../../../src/MatrixClientPeg");
var MatrixClientPeg = require("matrix-react-sdk/lib/MatrixClientPeg");
var sdk = require('matrix-react-sdk')
var VideoViewController = require('matrix-react-sdk/lib/controllers/molecules/voip/VideoView')

2
src/skins/vector/views/organisms/CreateRoom.js

@ -22,7 +22,7 @@ var CreateRoomController = require('matrix-react-sdk/lib/controllers/organisms/C
var sdk = require('matrix-react-sdk')
var PresetValues = require('../../../../src/controllers/atoms/create_room/Presets').Presets;
var PresetValues = require('matrix-react-sdk/lib/controllers/atoms/create_room/Presets').Presets;
var Loader = require("react-loader");

10
src/skins/vector/views/organisms/Notifier.js

@ -18,12 +18,12 @@ limitations under the License.
var NotifierController = require('matrix-react-sdk/lib/controllers/organisms/Notifier')
var MatrixClientPeg = require("../../../../src/MatrixClientPeg");
var TextForEvent = require("../../../../src/TextForEvent");
var extend = require("../../../../src/extend");
var dis = require("../../../../src/dispatcher");
var MatrixClientPeg = require('matrix-react-sdk/lib/MatrixClientPeg');
var TextForEvent = require('matrix-react-sdk/lib/TextForEvent');
var extend = require('matrix-react-sdk/lib/extend');
var dis = require('matrix-react-sdk/lib/dispatcher');
var Avatar = require("../../../../src/Avatar");
var Avatar = require('../../../../Avatar');
var NotifierView = {

6
src/skins/vector/views/organisms/RoomDirectory.js

@ -18,10 +18,10 @@ limitations under the License.
var React = require('react');
var MatrixClientPeg = require("../../../../src/MatrixClientPeg");
var Modal = require("../../../../src/Modal");
var MatrixClientPeg = require('matrix-react-sdk/lib/MatrixClientPeg');
var Modal = require('matrix-react-sdk/lib/Modal');
var sdk = require('matrix-react-sdk')
var dis = require("../../../../src/dispatcher");
var dis = require('matrix-react-sdk/lib/dispatcher');
var Loader = require("react-loader");

2
src/skins/vector/views/organisms/RoomView.js

@ -18,7 +18,7 @@ limitations under the License.
var React = require('react');
var MatrixClientPeg = require("../../../../src/MatrixClientPeg");
var MatrixClientPeg = require('matrix-react-sdk/lib/MatrixClientPeg');
var sdk = require('matrix-react-sdk')
var classNames = require("classnames");

4
src/skins/vector/views/organisms/UserSettings.js

@ -15,13 +15,13 @@ limitations under the License.
var React = require('react');
var sdk = require('matrix-react-sdk')
var MatrixClientPeg = require("../../../../src/MatrixClientPeg");
var MatrixClientPeg = require('matrix-react-sdk/lib/MatrixClientPeg');
var UserSettingsController = require('matrix-react-sdk/lib/controllers/organisms/UserSettings')
var Loader = require("react-loader");
var Modal = require("../../../../src/Modal");
var Modal = require('matrix-react-sdk/lib/Modal');
module.exports = React.createClass({
displayName: 'UserSettings',

2
src/skins/vector/views/pages/MatrixChat.js

@ -25,7 +25,7 @@ var MatrixChatController = require('matrix-react-sdk/lib/controllers/pages/Matri
var Loader = require("react-loader");
var classNames = require("classnames");
var dis = require("../../../../src/dispatcher");
var dis = require('matrix-react-sdk/lib/dispatcher');
module.exports = React.createClass({

2
src/skins/vector/views/templates/Login.js

@ -19,7 +19,7 @@ limitations under the License.
var React = require('react');
var sdk = require('matrix-react-sdk')
var MatrixClientPeg = require("../../../../src/MatrixClientPeg");
var MatrixClientPeg = require('matrix-react-sdk/lib/MatrixClientPeg');
var Loader = require("react-loader");

2
vector/fonts

@ -1 +1 @@
src/skins/vector/fonts
../src/skins/vector/fonts

2
vector/img

@ -1 +1 @@
src/skins/vector/img
../src/skins/vector/img
Loading…
Cancel
Save