1
0
Fork 0
mirror of https://github.com/documize/community.git synced 2025-08-03 04:25:25 +02:00

upgraded Ember and Bootstrap, merged changes

This commit is contained in:
sauls8t 2018-01-22 10:31:03 +00:00
parent b4fd42da38
commit 5dd7d9c181
114 changed files with 9814 additions and 1361 deletions

View file

@ -9,6 +9,7 @@
//
// https://documize.com
import $ from 'jquery';
import Mixin from '@ember/object/mixin';
// ID values expected format:

View file

@ -12,15 +12,15 @@
import Mixin from '@ember/object/mixin';
export default Mixin.create({
isReadonly: function () {
if (this.get('page.userId') === this.get('session.session.authenticated.user.id')) {
return undefined;
} else {
return "readonly";
}
}.property('page'),
// isReadonly() {
// if (this.get('page.userId') === this.get('session.session.authenticated.user.id')) {
// return undefined;
// } else {
// return "readonly";
// }
// }.property('page'),
isMine: function () {
return this.get('page.userId') === this.get('session.session.authenticated.user.id');
}.property('page')
// isMine() {
// return this.get('page.userId') === this.get('session.session.authenticated.user.id');
// }.property('page')
});

View file

@ -9,12 +9,11 @@
//
// https://documize.com
import $ from 'jquery';
import Mixin from '@ember/object/mixin';
import { schedule } from '@ember/runloop';
export default Mixin.create({
tooltips: [],
renderTooltips() {
schedule('afterRender', () => {
$('[data-toggle="tooltip"]').tooltip('dispose');
@ -24,5 +23,17 @@ export default Mixin.create({
removeTooltips() {
$('[data-toggle="tooltip"]').tooltip('dispose');
},
renderPopovers() {
schedule('afterRender', () => {
$('[data-toggle="popover"]').popover('dispose');
$('body').popover({selector: '[data-toggle="popover"]', delay: 250});
});
},
removePopovers() {
$('[data-toggle="tooltip"]').popover('dispose');
}
});