diff options
| author | Erik Johnston <erik@matrix.org> | 2014-08-19 16:41:13 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2014-08-19 16:41:13 +0100 |
| commit | e2b861cc67dc7be2b9f4fc8153cb37da362eee9c (patch) | |
| tree | ff158048eecc19f0c76494b393e8e74102bb548f /webclient | |
| parent | Remove debug logging from token parsing funcs. (diff) | |
| parent | Added registration/login jsfiddle, formatted so it can be loaded directly fro... (diff) | |
| download | synapse-e2b861cc67dc7be2b9f4fc8153cb37da362eee9c.tar.xz | |
Merge branch 'master' of github.com:matrix-org/synapse into sql_refactor
Diffstat (limited to 'webclient')
| -rw-r--r-- | webclient/components/matrix/matrix-service.js | 4 | ||||
| -rw-r--r-- | webclient/room/room.html | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/webclient/components/matrix/matrix-service.js b/webclient/components/matrix/matrix-service.js index 828396c866..664c5967af 100644 --- a/webclient/components/matrix/matrix-service.js +++ b/webclient/components/matrix/matrix-service.js @@ -68,9 +68,7 @@ angular.module('matrixService', []) params: params, data: data, headers: headers - }) - - return deferred.promise; + }); }; diff --git a/webclient/room/room.html b/webclient/room/room.html index 36bd95c1bb..8cae7ee515 100644 --- a/webclient/room/room.html +++ b/webclient/room/room.html @@ -76,7 +76,7 @@ <td> </td> <td> - <input id="mainInput" ng-model="imageURLToSend" ng-enter="sendImage()" placeholder="Image URL"/> + <input id="mainInput" ng-model="imageURLToSend" ng-enter="sendImage(imageURLToSend)" placeholder="Image URL"/> </td> <td width="100px"> <button ng-click="sendImage(imageURLToSend)">Send URL</button> |