Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
matrix-react-sdk
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Model registry
Analyze
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
GitHub Mirror
Matrix.org
matrix-react-sdk
Commits
085e07c5
Commit
085e07c5
authored
Jul 21, 2015
by
Erik Johnston
Browse files
Options
Downloads
Patches
Plain Diff
Display error on fail
parent
0e9074b0
Branches
Branches containing commit
No related tags found
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
skins/base/views/organisms/RoomView.js
+6
-2
6 additions, 2 deletions
skins/base/views/organisms/RoomView.js
with
6 additions
and
2 deletions
skins/base/views/organisms/RoomView.js
+
6
−
2
View file @
085e07c5
...
@@ -21,6 +21,7 @@ var React = require('react');
...
@@ -21,6 +21,7 @@ var React = require('react');
var
MatrixClientPeg
=
require
(
"
../../../../src/MatrixClientPeg
"
);
var
MatrixClientPeg
=
require
(
"
../../../../src/MatrixClientPeg
"
);
var
ComponentBroker
=
require
(
'
../../../../src/ComponentBroker
'
);
var
ComponentBroker
=
require
(
'
../../../../src/ComponentBroker
'
);
var
Modal
=
require
(
"
../../../../src/Modal
"
);
var
classNames
=
require
(
"
classnames
"
);
var
classNames
=
require
(
"
classnames
"
);
var
filesize
=
require
(
'
filesize
'
);
var
filesize
=
require
(
'
filesize
'
);
var
q
=
require
(
'
q
'
);
var
q
=
require
(
'
q
'
);
...
@@ -30,6 +31,7 @@ var RoomHeader = ComponentBroker.get('molecules/RoomHeader');
...
@@ -30,6 +31,7 @@ var RoomHeader = ComponentBroker.get('molecules/RoomHeader');
var
MessageComposer
=
ComponentBroker
.
get
(
'
molecules/MessageComposer
'
);
var
MessageComposer
=
ComponentBroker
.
get
(
'
molecules/MessageComposer
'
);
var
CallView
=
ComponentBroker
.
get
(
"
molecules/voip/CallView
"
);
var
CallView
=
ComponentBroker
.
get
(
"
molecules/voip/CallView
"
);
var
RoomSettings
=
ComponentBroker
.
get
(
"
molecules/RoomSettings
"
);
var
RoomSettings
=
ComponentBroker
.
get
(
"
molecules/RoomSettings
"
);
var
ErrorDialog
=
ComponentBroker
.
get
(
"
organisms/ErrorDialog
"
);
var
RoomViewController
=
require
(
"
../../../../src/controllers/organisms/RoomView
"
);
var
RoomViewController
=
require
(
"
../../../../src/controllers/organisms/RoomView
"
);
...
@@ -124,8 +126,10 @@ module.exports = React.createClass({
...
@@ -124,8 +126,10 @@ module.exports = React.createClass({
if
(
deferreds
.
length
)
{
if
(
deferreds
.
length
)
{
var
self
=
this
;
var
self
=
this
;
q
.
all
(
deferreds
).
fail
(
function
(
err
)
{
q
.
all
(
deferreds
).
fail
(
function
(
err
)
{
// TODO: Handle err
Modal
.
createDialog
(
ErrorDialog
,
{
console
.
error
(
err
);
title
:
"
Failed to set state
"
,
description
:
err
.
toString
()
});
}).
finally
(
function
()
{
}).
finally
(
function
()
{
self
.
setState
({
self
.
setState
({
uploadingRoomSettings
:
false
,
uploadingRoomSettings
:
false
,
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment