Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge master into develop #4778

Merged
merged 11 commits into from
Jul 28, 2018
Merged

Merge master into develop #4778

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
b733355
Merge pull request #4763 from pymedusa/release/release-0.2.7
p0psicles Jul 27, 2018
17e4fb0
Add pids to js files in main.mako
p0psicles Jul 27, 2018
a0b6585
Fix
sharkykh Jul 27, 2018
a8bb16f
Fix home tabs (#4764)
sharkykh Jul 27, 2018
e81cae2
Update changelog
sharkykh Jul 27, 2018
421ad5e
Bump version
sharkykh Jul 27, 2018
a6be2f8
Fix assets not showing on load on small and banner layouts
sharkykh Jul 27, 2018
3637619
Update CHANGELOG.md
sharkykh Jul 27, 2018
83d03d0
Fix #4775 - error when trying to rename episodes
sharkykh Jul 27, 2018
f5973b2
Merge pull request #4774 from pymedusa/hotfix/add-pids-to-js
medariox Jul 27, 2018
0fe2d62
Merge branch 'master' into develop
sharkykh Jul 28, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,13 @@
## Unreleased

-----

## 0.2.8 (2018-07-28)

#### Fixes
- Fixed tabs on home page when using the split home layout ([#4764](https://github.com/pymedusa/Medusa/pull/4764))
- Fixed black screen after update ([#4774](https://github.com/pymedusa/Medusa/pull/4774))
- Fixed error when trying to rename episodes ([#4774](https://github.com/pymedusa/Medusa/pull/4774))

-----

Expand Down
2 changes: 1 addition & 1 deletion medusa/common.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
# To enable, set SPOOF_USER_AGENT = True
SPOOF_USER_AGENT = False
INSTANCE_ID = str(uuid.uuid1())
VERSION = '0.2.7'
VERSION = '0.2.8'
USER_AGENT = 'Medusa/{version} ({system}; {release}; {instance})'.format(
version=VERSION, system=platform.system(), release=platform.release(),
instance=INSTANCE_ID)
Expand Down
2 changes: 2 additions & 0 deletions themes-default/slim/static/js/core.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,8 @@ const UTIL = {
UTIL.exec('common'); // Load common
UTIL.exec(controller); // Load MEDUSA[controller]
UTIL.exec(controller, action); // Load MEDUSA[controller][action]

window.dispatchEvent(new Event('medusa-loaded'));
}
};

Expand Down
5 changes: 5 additions & 0 deletions themes-default/slim/views/home.mako
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,11 @@ window.app = new Vue({
}
}),
mounted() {
const postLoad = () => {
// Update VueInViewport
window.dispatchEvent(new Event('scroll'));
};
window.addEventListener('medusa-loaded', postLoad, { once: true });
}
});
</script>
Expand Down
26 changes: 13 additions & 13 deletions themes-default/slim/views/layouts/main.mako
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,18 +115,18 @@

## Add Vue component x-templates here
## @NOTE: These will be usable on all pages
<script src="js/lib/vue.js"></script>
<script src="js/lib/http-vue-loader.js"></script>
<script src="js/lib/vue-async-computed@3.3.0.js"></script>
<script src="js/lib/vue-in-viewport-mixin.min.js"></script>
<script src="js/lib/vue-router.min.js"></script>
<script src="js/lib/vue-meta.min.js"></script>
<script src="js/lib/vue-snotify.min.js"></script>
<script src="js/lib/vue-js-toggle-button.js"></script>
<script src="js/lib/vuex.js"></script>
<script src="js/lib/vue-native-websocket-2.0.7.js"></script>
<script src="js/notifications.js"></script>
<script src="js/store.js"></script>
<script src="js/lib/vue.js?${sbPID}"></script>
<script src="js/lib/http-vue-loader.js?${sbPID}"></script>
<script src="js/lib/vue-async-computed@3.3.0.js?${sbPID}"></script>
<script src="js/lib/vue-in-viewport-mixin.min.js?${sbPID}"></script>
<script src="js/lib/vue-router.min.js?${sbPID}"></script>
<script src="js/lib/vue-meta.min.js?${sbPID}"></script>
<script src="js/lib/vue-snotify.min.js?${sbPID}"></script>
<script src="js/lib/vue-js-toggle-button.js?${sbPID}"></script>
<script src="js/lib/vuex.js?${sbPID}"></script>
<script src="js/lib/vue-native-websocket-2.0.7.js?${sbPID}"></script>
<script src="js/notifications.js?${sbPID}"></script>
<script src="js/store.js?${sbPID}"></script>
<script>
Vue.component('app-header', httpVueLoader('js/templates/app-header.vue'));
Vue.component('scroll-buttons', httpVueLoader('js/templates/scroll-buttons.vue'));
Expand Down Expand Up @@ -202,7 +202,7 @@
}
</script>
<%block name="scripts" />
<script src="js/router.js"></script>
<script src="js/router.js?${sbPID}"></script>
<script>
if (!window.app) {
console.info('Loading Vue with router since window.app is missing.');
Expand Down
4 changes: 2 additions & 2 deletions themes-default/slim/views/testRename.mako
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,15 +138,15 @@ const startVue = () => {
<tbody>
<%
odd = not odd
epStr = str(cur_ep_obj.season) + "x" + str(cur_ep_obj.episode)
epStr = 's{season}e{episode}'.format(season=cur_ep_obj.season, episode=cur_ep_obj.episode)
epList = sorted([cur_ep_obj.episode] + [x.episode for x in cur_ep_obj.related_episodes])
if len(epList) > 1:
epList = [min(epList), max(epList)]
%>
<tr class="season-${cur_season} ${'good' if curLoc == newLoc else 'wanted'} seasonstyle">
<td class="col-checkbox">
% if curLoc != newLoc:
<input type="checkbox" class="epCheck" id="${str(cur_ep_obj.season) + 'x' + str(cur_ep_obj.episode)}" name="${str(cur_ep_obj.season) + "x" + str(cur_ep_obj.episode)}" />
<input type="checkbox" class="epCheck" id="${epStr}" name="${epStr}" />
% endif
</td>
<td align="center" valign="top" class="nowrap">${"-".join(map(str, epList))}</td>
Expand Down
2 changes: 2 additions & 0 deletions themes/dark/assets/js/core.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,8 @@ const UTIL = {
UTIL.exec('common'); // Load common
UTIL.exec(controller); // Load MEDUSA[controller]
UTIL.exec(controller, action); // Load MEDUSA[controller][action]

window.dispatchEvent(new Event('medusa-loaded'));
}
};

Expand Down
2 changes: 1 addition & 1 deletion themes/dark/assets/js/core.js.map
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions themes/dark/templates/home.mako
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,11 @@ window.app = new Vue({
}
}),
mounted() {
const postLoad = () => {
// Update VueInViewport
window.dispatchEvent(new Event('scroll'));
};
window.addEventListener('medusa-loaded', postLoad, { once: true });
}
});
</script>
Expand Down
26 changes: 13 additions & 13 deletions themes/dark/templates/layouts/main.mako
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,18 +115,18 @@

## Add Vue component x-templates here
## @NOTE: These will be usable on all pages
<script src="js/lib/vue.js"></script>
<script src="js/lib/http-vue-loader.js"></script>
<script src="js/lib/vue-async-computed@3.3.0.js"></script>
<script src="js/lib/vue-in-viewport-mixin.min.js"></script>
<script src="js/lib/vue-router.min.js"></script>
<script src="js/lib/vue-meta.min.js"></script>
<script src="js/lib/vue-snotify.min.js"></script>
<script src="js/lib/vue-js-toggle-button.js"></script>
<script src="js/lib/vuex.js"></script>
<script src="js/lib/vue-native-websocket-2.0.7.js"></script>
<script src="js/notifications.js"></script>
<script src="js/store.js"></script>
<script src="js/lib/vue.js?${sbPID}"></script>
<script src="js/lib/http-vue-loader.js?${sbPID}"></script>
<script src="js/lib/vue-async-computed@3.3.0.js?${sbPID}"></script>
<script src="js/lib/vue-in-viewport-mixin.min.js?${sbPID}"></script>
<script src="js/lib/vue-router.min.js?${sbPID}"></script>
<script src="js/lib/vue-meta.min.js?${sbPID}"></script>
<script src="js/lib/vue-snotify.min.js?${sbPID}"></script>
<script src="js/lib/vue-js-toggle-button.js?${sbPID}"></script>
<script src="js/lib/vuex.js?${sbPID}"></script>
<script src="js/lib/vue-native-websocket-2.0.7.js?${sbPID}"></script>
<script src="js/notifications.js?${sbPID}"></script>
<script src="js/store.js?${sbPID}"></script>
<script>
Vue.component('app-header', httpVueLoader('js/templates/app-header.vue'));
Vue.component('scroll-buttons', httpVueLoader('js/templates/scroll-buttons.vue'));
Expand Down Expand Up @@ -202,7 +202,7 @@
}
</script>
<%block name="scripts" />
<script src="js/router.js"></script>
<script src="js/router.js?${sbPID}"></script>
<script>
if (!window.app) {
console.info('Loading Vue with router since window.app is missing.');
Expand Down
4 changes: 2 additions & 2 deletions themes/dark/templates/testRename.mako
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,15 +138,15 @@ const startVue = () => {
<tbody>
<%
odd = not odd
epStr = str(cur_ep_obj.season) + "x" + str(cur_ep_obj.episode)
epStr = 's{season}e{episode}'.format(season=cur_ep_obj.season, episode=cur_ep_obj.episode)
epList = sorted([cur_ep_obj.episode] + [x.episode for x in cur_ep_obj.related_episodes])
if len(epList) > 1:
epList = [min(epList), max(epList)]
%>
<tr class="season-${cur_season} ${'good' if curLoc == newLoc else 'wanted'} seasonstyle">
<td class="col-checkbox">
% if curLoc != newLoc:
<input type="checkbox" class="epCheck" id="${str(cur_ep_obj.season) + 'x' + str(cur_ep_obj.episode)}" name="${str(cur_ep_obj.season) + "x" + str(cur_ep_obj.episode)}" />
<input type="checkbox" class="epCheck" id="${epStr}" name="${epStr}" />
% endif
</td>
<td align="center" valign="top" class="nowrap">${"-".join(map(str, epList))}</td>
Expand Down
2 changes: 2 additions & 0 deletions themes/light/assets/js/core.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,8 @@ const UTIL = {
UTIL.exec('common'); // Load common
UTIL.exec(controller); // Load MEDUSA[controller]
UTIL.exec(controller, action); // Load MEDUSA[controller][action]

window.dispatchEvent(new Event('medusa-loaded'));
}
};

Expand Down
Loading