mirror of
https://github.com/flarum/core.git
synced 2025-08-12 11:24:30 +02:00
Revert changes that have been separated out into https://github.com/flarum/core/pull/2262/files
This commit is contained in:
committed by
Franz Liedke
parent
389bc59745
commit
63984b43f9
@@ -99,6 +99,8 @@ export default class Modal extends Component {
|
|||||||
this.$('form').find('input, select, textarea').first().focus().select();
|
this.$('form').find('input, select, textarea').first().focus().select();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
onhide() {}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Hide the modal.
|
* Hide the modal.
|
||||||
*/
|
*/
|
||||||
|
@@ -82,7 +82,7 @@ export default class Composer extends Component {
|
|||||||
});
|
});
|
||||||
|
|
||||||
// When the escape key is pressed on any inputs, close the composer.
|
// When the escape key is pressed on any inputs, close the composer.
|
||||||
this.$().on('keydown', ':input', 'esc', () => this.state.close());
|
this.$().on('keydown', ':input', 'esc', () => this.close());
|
||||||
|
|
||||||
const handlers = {};
|
const handlers = {};
|
||||||
|
|
||||||
|
@@ -26,6 +26,11 @@ export default class PostStream extends Component {
|
|||||||
}
|
}
|
||||||
|
|
||||||
view() {
|
view() {
|
||||||
|
function fadeIn(element, isInitialized, context) {
|
||||||
|
if (!context.fadedIn) $(element).hide().fadeIn();
|
||||||
|
context.fadedIn = true;
|
||||||
|
}
|
||||||
|
|
||||||
let lastTime;
|
let lastTime;
|
||||||
|
|
||||||
const viewingEnd = this.stream.viewingEnd();
|
const viewingEnd = this.stream.viewingEnd();
|
||||||
@@ -42,6 +47,7 @@ export default class PostStream extends Component {
|
|||||||
content = PostComponent ? PostComponent.component({ post }) : '';
|
content = PostComponent ? PostComponent.component({ post }) : '';
|
||||||
|
|
||||||
attrs.key = 'post' + post.id();
|
attrs.key = 'post' + post.id();
|
||||||
|
attrs.config = fadeIn;
|
||||||
attrs['data-time'] = time.toISOString();
|
attrs['data-time'] = time.toISOString();
|
||||||
attrs['data-number'] = post.number();
|
attrs['data-number'] = post.number();
|
||||||
attrs['data-id'] = post.id();
|
attrs['data-id'] = post.id();
|
||||||
|
@@ -177,7 +177,7 @@ export default class SignUpModal extends Modal {
|
|||||||
* Get the data that should be submitted in the sign-up request.
|
* Get the data that should be submitted in the sign-up request.
|
||||||
*
|
*
|
||||||
* @return {Object}
|
* @return {Object}
|
||||||
* @protected
|
* @public
|
||||||
*/
|
*/
|
||||||
submitData() {
|
submitData() {
|
||||||
const data = {
|
const data = {
|
||||||
|
@@ -104,18 +104,3 @@
|
|||||||
.animation(pulsate 0.2s ease-in-out);
|
.animation(pulsate 0.2s ease-in-out);
|
||||||
.animation-iteration-count(1);
|
.animation-iteration-count(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
@keyframes fadeIn {
|
|
||||||
0% {opacity:0;}
|
|
||||||
100% {opacity:1;}
|
|
||||||
}
|
|
||||||
|
|
||||||
@-webkit-keyframes fadeIn {
|
|
||||||
0% {opacity:0;}
|
|
||||||
100% {opacity:1;}
|
|
||||||
}
|
|
||||||
|
|
||||||
@-o-keyframes fadeIn {
|
|
||||||
0% {opacity:0;}
|
|
||||||
100% {opacity:1;}
|
|
||||||
}
|
|
||||||
|
Reference in New Issue
Block a user