Docker/documize
Docker/documize
1
0
Fork 0
mirror of https://github.com/documize/community.git synced 2025-07-24 07:39:43 +02:00
Code Releases Activity

improved empty state and dropdown positions

Browse source
This commit is contained in:
Harvey Kandola 2017-10-10 16:02:46 -04:00
parent c77b384215
commit 38b401f646
25 changed files with 148 additions and 96 deletions
Download patch file Download diff file Expand all files Collapse all files

22
gui/app/components/customize/user-admin.js
View file

@ -114,19 +114,14 @@ export default Ember.Component.extend(AuthProvider, DropdownMixin, {
this.closeDropdown();
let drop = new Drop({
let dropOptions = Object.assign(this.get('dropDefaults'), {
target: $(".edit-button-" + id)[0],
content: $(".edit-user-dialog")[0],
classes: 'drop-theme-basic',
position: "bottom right",
openOn: "always",
tetherOptions: {
offset: "5px 0",
targetOffset: "10px 0"
},
remove: false
});
remove: false});
let drop = new Drop(dropOptions);
self.set('dropdown', drop);
drop.on('open', function () {
@ -141,19 +136,14 @@ export default Ember.Component.extend(AuthProvider, DropdownMixin, {
this.closeDropdown();
let drop = new Drop({
let dropOptions = Object.assign(this.get('dropDefaults'), {
target: $(".delete-button-" + id)[0],
content: $(".delete-user-dialog")[0],
classes: 'drop-theme-basic',
position: "bottom right",
openOn: "always",
tetherOptions: {
offset: "5px 0",
targetOffset: "10px 0"
},
remove: false
});
remove: false});
let drop = new Drop(dropOptions);
this.set('dropdown', drop);
},

33
gui/app/components/document/document-attachments.js
View file

@ -12,11 +12,12 @@
import Ember from 'ember';
import NotifierMixin from '../../mixins/notifier';
import TooltipMixin from '../../mixins/tooltip';
import DropdownMixin from '../../mixins/dropdown';
export default Ember.Component.extend(NotifierMixin, TooltipMixin, {
export default Ember.Component.extend(NotifierMixin, TooltipMixin, DropdownMixin, {
documentService: Ember.inject.service('document'),
appMeta: Ember.inject.service(),
drop: null,
dropdown: null,
hasAttachments: Ember.computed.notEmpty('files'),
deleteAttachment: {
id: "",
@ -78,11 +79,7 @@ export default Ember.Component.extend(NotifierMixin, TooltipMixin, {
willDestroyElement() {
this._super(...arguments);
let drop = this.get('drop');
if (is.not.null(drop)) {
drop.destroy();
}
this.destroyDropdown();
},
getAttachments() {
@ -100,25 +97,21 @@ export default Ember.Component.extend(NotifierMixin, TooltipMixin, {
$(".delete-attachment-dialog").css("display", "block");
let drop = new Drop({
this.closeDropdown();
let dropOptions = Object.assign(this.get('dropDefaults'), {
target: $(".delete-attachment-" + id)[0],
content: $(".delete-attachment-dialog")[0],
classes: 'drop-theme-basic',
position: "bottom right",
openOn: "always",
tetherOptions: {
offset: "5px 0",
targetOffset: "10px 0"
},
remove: false
});
remove: false});
this.set('drop', drop);
let drop = new Drop(dropOptions);
this.set('dropdown', drop);
},
onCancel() {
let drop = this.get('drop');
drop.close();
this.closeDropdown();
this.set('deleteAttachment', {
id: "",
@ -127,9 +120,9 @@ export default Ember.Component.extend(NotifierMixin, TooltipMixin, {
},
onDelete() {
this.closeDropdown();
let attachment = this.get('deleteAttachment');
let drop = this.get('drop');
drop.close();
this.showNotification(`Deleted ${name}`);

8
gui/app/components/dropdown-dialog.js
View file

@ -62,7 +62,13 @@ export default Ember.Component.extend({
tetherOptions: {
offset: self.offset,
targetOffset: self.targetOffset,
targetModifier: 'scroll-handle'
// targetModifier: 'scroll-handle',
constraints: [
{
to: 'scrollParent',
attachment: 'together'
}
],
},
remove: true
});

11
gui/app/components/folder/category-admin.js
View file

@ -160,19 +160,14 @@ export default Ember.Component.extend(NotifierMixin, TooltipMixin, DropdownMixin
$(".category-access-dialog").css("display", "block");
let drop = new Drop({
let dropOptions = Object.assign(this.get('dropDefaults'), {
target: $("#category-access-button-" + catId)[0],
content: $(".category-access-dialog")[0],
classes: 'drop-theme-basic',
position: "bottom right",
openOn: "always",
tetherOptions: {
offset: "5px 0",
targetOffset: "10px 0"
},
remove: false
});
remove: false});
let drop = new Drop(dropOptions);
this.set('dropdown', drop);
});
},

7
gui/app/components/folder/documents-list.js
View file

@ -12,6 +12,13 @@
import Ember from 'ember';
export default Ember.Component.extend({
showAdd: Ember.computed('permissions', 'documents', function() {
return this.get('documents.length') === 0 && this.get('permissions.documentAdd');
}),
showLockout: Ember.computed('permissions', 'documents', function() {
return this.get('documents.length') === 0 && !this.get('permissions.documentAdd');
}),
actions: {
selectDocument(documentId) {
let doc = this.get('documents').findBy('id', documentId);

1
gui/app/components/folder/permission-admin.js
View file

@ -112,6 +112,7 @@ export default Ember.Component.extend(NotifierMixin, {
this.get('folderService').savePermissions(folder.get('id'), payload).then(() => {
this.showNotification('Saved permissions');
this.get('router').transitionTo('folder', folder.get('id'), folder.get('slug'));
});
if (is.not.undefined(hasEveryone)) {

3
gui/app/components/folder/space-toolbar.js
View file

@ -34,6 +34,9 @@ export default Ember.Component.extend(NotifierMixin, TooltipMixin, AuthMixin, {
newName: ''
},
deleteSpaceName: '',
spaceSettings: Ember.computed('permissions', function() {
return this.get('permissions.spaceOwner') || this.get('permissions.spaceManage');
}),
didReceiveAttrs() {
this._super(...arguments);