imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/develop' into rav/no_resume_client_on_login

Browse source
This commit is contained in:
Richard van der Hoff 2017-06-14 11:08:16 +01:00
commit 5d649626b0
7 changed files with 153 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/components/structures/ScrollPanel.js
View file

@ -352,13 +352,14 @@ module.exports = React.createClass({
const tile = tiles[backwards ? i : tiles.length - 1 - i];
// Subtract height of tile as if it were unpaginated
excessHeight -= tile.clientHeight;
//If removing the tile would lead to future pagination, break before setting scroll token
if (tile.clientHeight > excessHeight) {
break;
}
// The tile may not have a scroll token, so guard it
if (tile.dataset.scrollTokens) {
markerScrollToken = tile.dataset.scrollTokens.split(',')[0];
}
if (tile.clientHeight > excessHeight) {
break;
}
}
if (markerScrollToken) {

6
src/components/views/dialogs/SetEmailDialog.js
View file

@ -14,15 +14,11 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
import q from 'q';
import React from 'react';
import sdk from '../../../index';
import MatrixClientPeg from '../../../MatrixClientPeg';
import classnames from 'classnames';
import KeyCode from '../../../KeyCode';
import Email from '../../../email';
import AddThreepid from '../../../AddThreepid';
import { _t, _tJsx } from '../../../languageHandler';
import { _t } from '../../../languageHandler';
import Modal from '../../../Modal';