0.8.3

Centre images in dialog buttons

CHANGELOG.md

@@ -1,3 +1,16 @@
+Changes in [0.8.3](https://github.com/vector-im/vector-web/releases/tag/v0.8.3) (2016-10-12)
+============================================================================================
+[Full Changelog](https://github.com/vector-im/vector-web/compare/v0.8.2...v0.8.3)
+
+ * Centre images in dialog buttons
+   [\#2453](https://github.com/vector-im/vector-web/pull/2453)
+ * Only show quote option if RTE is enabled
+   [\#2448](https://github.com/vector-im/vector-web/pull/2448)
+ * Fix join button for 'matrix' networks
+   [\#2443](https://github.com/vector-im/vector-web/pull/2443)
+ * Don't stop paginating if no rooms match
+   [\#2422](https://github.com/vector-im/vector-web/pull/2422)
+
 Changes in [0.8.2](https://github.com/vector-im/vector-web/releases/tag/v0.8.2) (2016-10-05)
 ============================================================================================
 [Full Changelog](https://github.com/vector-im/vector-web/compare/v0.8.1...v0.8.2)

package.json

@@ -1,6 +1,6 @@
 {
   "name": "vector-web",
-  "version": "0.8.2",
+  "version": "0.8.3",
   "description": "Vector webapp",
   "author": "matrix.org",
   "repository": {
@@ -47,8 +47,8 @@
     "gfm.css": "^1.1.1",
     "highlight.js": "^9.0.0",
     "linkifyjs": "^2.1.3",
-    "matrix-js-sdk": "0.6.2",
-    "matrix-react-sdk": "0.7.3",
+    "matrix-js-sdk": "0.6.3",
+    "matrix-react-sdk": "0.7.4",
     "modernizr": "^3.1.0",
     "q": "^1.4.1",
     "react": "^15.2.1",

src/components/structures/RoomDirectory.js

@@ -503,7 +503,11 @@ module.exports = React.createClass({
         // matches this network. We look for a matching protocol
         // and the existence of a 'domain' field and if present,
         // its value.
-        if (this.protocols[network_info.protocol].instances.length == 1) {
+        if (
+            this.protocols[network_info.protocol] &&
+            this.protocols[network_info.protocol].instances &&
+            this.protocols[network_info.protocol].instances.length == 1
+        ) {
             const the_instance = this.protocols[network_info.protocol].instances[0];
             // If there's only one instance in this protocol, use it
             // as long as it has no domain (which we assume to mean it's
@@ -554,24 +558,29 @@ module.exports = React.createClass({
             </div>;
         } else {
             const rows = this.getRows();
+            // we still show the scrollpanel, at least for now, because
+            // otherwise we don't fetch more because we don't get a fill
+            // request from the scrollpanel because there isn't one
+            let scrollpanel_content;
             if (rows.length == 0) {
-                content = <i>No rooms to show</i>;
+                scrollpanel_content = <i>No rooms to show</i>;
             } else {
-                const ScrollPanel = sdk.getComponent("structures.ScrollPanel");
-                content = <ScrollPanel ref={this.collectScrollPanel}
-                    className="mx_RoomDirectory_tableWrapper"
-                    onFillRequest={ this.onFillRequest }
-                    stickyBottom={false}
-                    startAtBottom={false}
-                    onResize={function(){}}
-                >
-                    <table ref="directory_table" className="mx_RoomDirectory_table">
-                        <tbody>
-                            { this.getRows() }
-                        </tbody>
-                    </table>
-                </ScrollPanel>;
+                scrollpanel_content = <table ref="directory_table" className="mx_RoomDirectory_table">
+                    <tbody>
+                        { this.getRows() }
+                    </tbody>
+                </table>;
             }
+            const ScrollPanel = sdk.getComponent("structures.ScrollPanel");
+            content = <ScrollPanel ref={this.collectScrollPanel}
+                className="mx_RoomDirectory_tableWrapper"
+                onFillRequest={ this.onFillRequest }
+                stickyBottom={false}
+                startAtBottom={false}
+                onResize={function(){}}
+            >
+                { scrollpanel_content }
+            </ScrollPanel>;
         }
 
         let placeholder = 'Search for a room';
@@ -586,10 +595,12 @@ module.exports = React.createClass({
             placeholder = this.props.config.networks[this.state.network].example;
         }
 
-        const showJoinButton = (
-            this._stringLooksLikeId(this.state.filterString, this.state.network) &&
-            this._getFieldsForThirdPartyLocation(this.state.filterString, this.state.network)
-        );
+        let showJoinButton = this._stringLooksLikeId(this.state.filterString, this.state.network);
+        if (this.state.network && this.state.network != '_matrix') {
+            if (this._getFieldsForThirdPartyLocation(this.state.filterString, this.state.network) === null) {
+                showJoinButton = false;
+            }
+        }
 
         const SimpleRoomHeader = sdk.getComponent('rooms.SimpleRoomHeader');
         const NetworkDropdown = sdk.getComponent('directory.NetworkDropdown');

src/components/views/context_menus/MessageContextMenu.js

@@ -20,9 +20,10 @@ var React = require('react');
 
 var MatrixClientPeg = require('matrix-react-sdk/lib/MatrixClientPeg');
 var dis = require('matrix-react-sdk/lib/dispatcher');
-var sdk = require('matrix-react-sdk')
+var sdk = require('matrix-react-sdk');
 var Modal = require('matrix-react-sdk/lib/Modal');
 var Resend = require("matrix-react-sdk/lib/Resend");
+import * as UserSettingsStore from 'matrix-react-sdk/lib/UserSettingsStore';
 
 module.exports = React.createClass({
     displayName: 'MessageContextMenu',
@@ -163,7 +164,7 @@ module.exports = React.createClass({
                 {viewSourceButton}
                 {unhidePreviewButton}
                 {permalinkButton}
-                {quoteButton}
+                {UserSettingsStore.isFeatureEnabled('rich_text_editor') ? quoteButton : null}
             </div>
         );
     }

src/skins/vector/css/common.css

@@ -214,6 +214,9 @@ textarea {
     cursor: pointer;
     color: #76cfa6;
     background-color: #fff;
+
+    /* align images in buttons (eg spinners) */
+    vertical-align: middle;
 }
 
 .mx_Dialog button.mx_Dialog_primary, .mx_Dialog  input[type="submit"].mx_Dialog_primary {

src/skins/vector/css/matrix-react-sdk/views/rooms/MemberInfo.css

@@ -92,7 +92,7 @@ limitations under the License.
 }
 
 .mx_MemberInfo_createRoom_label {
-    width: 150px ! important;
+    width: initial ! important;
     cursor: pointer;
 }