EVOgeek
/
Vmeda.Online
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1953 from crazyserver/MOBILE-3039 

Mobile 3039
main
Juan Leyva 2019-05-28 10:42:06 +02:00 committed by GitHub
parent 5d81daecfd 3e948fa2d9
commit 1af3515344
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile
View File

@ -21,8 +21,6 @@ COPY . /app
# Install npm libraries and run gulp to initialize the project. # Install npm libraries and run gulp to initialize the project.
RUN npm install && gulp && rm -rf /root/.npm RUN npm install && gulp && rm -rf /root/.npm
RUN ionic info
# Provide a Healthcheck command for easier use in CI. # Provide a Healthcheck command for easier use in CI.
HEALTHCHECK --interval=10s --timeout=3s --start-period=30s CMD curl -f http://localhost:8100 || exit 1 HEALTHCHECK --interval=10s --timeout=3s --start-period=30s CMD curl -f http://localhost:8100 || exit 1

6
src/addon/mod/forum/pages/discussion/discussion.ts
View File

@ -299,8 +299,6 @@ export class AddonModForumDiscussionPage implements OnDestroy {
const direction = this.sort == 'flat-newest' ? 'DESC' : 'ASC'; const direction = this.sort == 'flat-newest' ? 'DESC' : 'ASC';
this.forumProvider.sortDiscussionPosts(posts, direction); this.forumProvider.sortDiscussionPosts(posts, direction);
} }
this.defaultSubject = this.translate.instant('addon.mod_forum.re') + ' ' + this.discussion.subject;
this.replyData.subject = this.defaultSubject;
// Now try to get the forum. // Now try to get the forum.
return this.fetchForum().then((forum) => { return this.fetchForum().then((forum) => {
@ -343,6 +341,10 @@ export class AddonModForumDiscussionPage implements OnDestroy {
this.forum = {}; this.forum = {};
this.accessInfo = {}; this.accessInfo = {};
}).then(() => { }).then(() => {
this.defaultSubject = this.translate.instant('addon.mod_forum.re') + ' ' +
(this.discussion ? this.discussion.subject : "");
this.replyData.subject = this.defaultSubject;
const startingPost = this.forumProvider.extractStartingPost(posts); const startingPost = this.forumProvider.extractStartingPost(posts);
if (startingPost) { if (startingPost) {
// Update discussion data from first post. // Update discussion data from first post.

7
src/components/ion-tabs/ion-tabs.scss
View File

@ -37,6 +37,13 @@ ion-app.app-root core-ion-tabs {
} }
} }
.tabbar[hidden] + .tabcontent {
width: 100%;
core-ion-tab {
@include position(0, 0, 0, 0);
}
}
.tabcontent { .tabcontent {
width: calc(100% - #{($core-sidetab-size)}); width: calc(100% - #{($core-sidetab-size)});
position: absolute; position: absolute;