oss/FrankerFaceZ
oss/FrankerFaceZ
1
0
Fork 0
mirror of https://github.com/FrankerFaceZ/FrankerFaceZ.git synced 2025-09-15 17:46:55 +00:00
Code Wiki Activity

4.5.4

Browse source 
* Fixed: Raven's updated Vue plugin causing Vue to fail to load.
* Fixed: Placeholder text when editing chat ban reasons.
This commit is contained in:
SirStendec 2019-06-20 15:30:18 -04:00
parent 33e81bc7eb
commit 04aa1789a2
4 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/main.js
View file

@ -149,7 +149,7 @@ ${typeof x[1] === 'string' ? x[1] : JSON.stringify(x[1], null, 4)}`).join('\n\n'
FrankerFaceZ.Logger = Logger; FrankerFaceZ.Logger = Logger;
const VER = FrankerFaceZ.version_info = { const VER = FrankerFaceZ.version_info = {
major: 4, minor: 5, revision: 3, major: 4, minor: 5, revision: 4,
commit: __git_commit__, commit: __git_commit__,
build: __webpack_hash__, build: __webpack_hash__,
toString: () => toString: () =>

2
src/modules/main_menu/components/reason-editor.vue
View file

@ -8,7 +8,7 @@
<input <input
v-else v-else
v-model="edit_data.text" v-model="edit_data.text"
:placeholder="adding ? t('setting.reasons.add-placeholder', 'Add a new reason') : edit_data" :placeholder="adding ? t('setting.reasons.add-placeholder', 'Add a new reason') : edit_data.text"
type="text" type="text"
class="tw-block tw-full-width tw-border-radius-medium tw-font-size-6 tw-full-width tw-input tw-pd-x-1 tw-pd-y-05" class="tw-block tw-full-width tw-border-radius-medium tw-font-size-6 tw-full-width tw-input tw-pd-x-1 tw-pd-y-05"
autocapitalize="off" autocapitalize="off"

8
src/utilities/vue.js
View file

@ -24,13 +24,13 @@ export class Vue extends Module {
const [ const [
ObserveVisibility, ObserveVisibility,
Clickaway, Clickaway,
RavenVue, //RavenVue,
Components Components
] = await Promise.all([ ] = await Promise.all([
import(/* webpackChunkName: "vue" */ 'vue-observe-visibility'), import(/* webpackChunkName: "vue" */ 'vue-observe-visibility'),
import(/* webpackChunkName: "vue" */ 'vue-clickaway'), import(/* webpackChunkName: "vue" */ 'vue-clickaway'),
import(/* webpackChunkName: "vue" */ 'raven-js/plugins/vue'), //import(/* webpackChunkName: "vue" */ 'raven-js/plugins/vue'),
import(/* webpackChunkName: "vue" */ 'src/std-components/index.js') import(/* webpackChunkName: "vue" */ 'src/std-components/index.js')
]); ]);
@ -39,8 +39,8 @@ export class Vue extends Module {
Vue.use(ObserveVisibility); Vue.use(ObserveVisibility);
Vue.mixin(Clickaway.mixin); Vue.mixin(Clickaway.mixin);
if ( ! DEBUG && this.root.raven ) /*if ( ! DEBUG && this.root.raven )
this.root.raven.addPlugin(RavenVue, Vue); this.root.raven.addPlugin(RavenVue, Vue);*/
for(const key in components) for(const key in components)
if ( has(components, key) ) if ( has(components, key) )

1
webpack.web.prod.js
View file

@ -49,6 +49,7 @@ module.exports = merge(common, {
} }
]), ]),
new ManifestPlugin({ new ManifestPlugin({
publicPath: '',
map: data => { map: data => {
if ( data.name.endsWith('.scss') ) if ( data.name.endsWith('.scss') )
data.name = `${data.name.substr(0,data.name.length - 5)}.css`; data.name = `${data.name.substr(0,data.name.length - 5)}.css`;