mirror of
https://github.com/wallabag/wallabag.git
synced 2024-11-30 04:51:01 +00:00
a6b242a1fd
- Update SchebTwoFactorBundle to version 3
- Enable Google 2fa on the bundle
- Disallow ability to use both email and google as 2fa
- Update Ocramius Proxy Manager to handle typed function & attributes (from PHP 7)
- use `$this->addFlash` shortcut instead of `$this->get('session')->getFlashBag()->add`
- update admin to be able to create/reset the 2fa
110 lines
3.3 KiB
JavaScript
110 lines
3.3 KiB
JavaScript
/* jQuery */
|
|
import $ from 'jquery';
|
|
|
|
/* Annotations */
|
|
import annotator from 'annotator';
|
|
|
|
/* Fonts */
|
|
import 'material-design-icons-iconfont/dist/material-design-icons.css';
|
|
import 'lato-font/css/lato-font.css';
|
|
import './global.scss';
|
|
|
|
/* Shortcuts */
|
|
import './js/shortcuts/entry';
|
|
import './js/shortcuts/main';
|
|
|
|
/* Hightlight */
|
|
import './js/highlight';
|
|
|
|
import { savePercent, retrievePercent } from './js/tools';
|
|
|
|
/* ==========================================================================
|
|
Annotations & Remember position
|
|
========================================================================== */
|
|
|
|
$(document).ready(() => {
|
|
if ($('article').length) {
|
|
const app = new annotator.App();
|
|
|
|
app.include(annotator.ui.main, {
|
|
element: document.querySelector('article'),
|
|
});
|
|
|
|
const authorization = {
|
|
permits() { return true; },
|
|
};
|
|
app.registry.registerUtility(authorization, 'authorizationPolicy');
|
|
|
|
const x = JSON.parse($('#annotationroutes').html());
|
|
app.include(annotator.storage.http, $.extend({}, x, {
|
|
onError(msg, xhr) {
|
|
if (!Object.prototype.hasOwnProperty.call(xhr, 'responseJSON')) {
|
|
annotator.notification.banner('An error occurred', 'error');
|
|
return;
|
|
}
|
|
$.each(xhr.responseJSON.children, (k, v) => {
|
|
if (v.errors) {
|
|
$.each(v.errors, (n, errorText) => {
|
|
annotator.notification.banner(errorText, 'error');
|
|
});
|
|
}
|
|
});
|
|
},
|
|
}));
|
|
|
|
app.start().then(() => {
|
|
app.annotations.load({ entry: x.entryId });
|
|
});
|
|
|
|
$(window).scroll(() => {
|
|
const scrollTop = $(window).scrollTop();
|
|
const docHeight = $(document).height();
|
|
const scrollPercent = (scrollTop) / (docHeight);
|
|
const scrollPercentRounded = Math.round(scrollPercent * 100) / 100;
|
|
savePercent(x.entryId, scrollPercentRounded);
|
|
});
|
|
|
|
retrievePercent(x.entryId);
|
|
|
|
$(window).resize(() => {
|
|
retrievePercent(x.entryId, true);
|
|
});
|
|
}
|
|
|
|
document.querySelectorAll('[data-handler=tag-rename]').forEach((item) => {
|
|
const current = item;
|
|
current.wallabag_edit_mode = false;
|
|
current.onclick = (event) => {
|
|
const target = event.currentTarget;
|
|
|
|
if (target.wallabag_edit_mode === false) {
|
|
$(target.parentNode.querySelector('[data-handle=tag-link]')).addClass('hidden');
|
|
$(target.parentNode.querySelector('[data-handle=tag-rename-form]')).removeClass('hidden');
|
|
target.parentNode.querySelector('[data-handle=tag-rename-form] input').focus();
|
|
target.querySelector('.material-icons').innerHTML = 'done';
|
|
|
|
target.wallabag_edit_mode = true;
|
|
} else {
|
|
target.parentNode.querySelector('[data-handle=tag-rename-form]').submit();
|
|
}
|
|
};
|
|
});
|
|
|
|
// mimic radio button because emailTwoFactor is a boolean
|
|
$('#update_user_googleTwoFactor').on('change', () => {
|
|
$('#update_user_emailTwoFactor').prop('checked', false);
|
|
});
|
|
|
|
$('#update_user_emailTwoFactor').on('change', () => {
|
|
$('#update_user_googleTwoFactor').prop('checked', false);
|
|
});
|
|
|
|
// same mimic for super admin
|
|
$('#user_googleTwoFactor').on('change', () => {
|
|
$('#user_emailTwoFactor').prop('checked', false);
|
|
});
|
|
|
|
$('#user_emailTwoFactor').on('change', () => {
|
|
$('#user_googleTwoFactor').prop('checked', false);
|
|
});
|
|
});
|