From 8ea7a44bd3acdc14928880c5917c2ac50e88927b Mon Sep 17 00:00:00 2001 From: Heiko Kernbach Date: Fri, 10 Oct 2014 11:13:03 +0200 Subject: [PATCH 1/3] fixed modal view not hiding after successful deletion of a collection --- .../system/aardvark/frontend/js/views/collectionsItemView.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/js/apps/system/aardvark/frontend/js/views/collectionsItemView.js b/js/apps/system/aardvark/frontend/js/views/collectionsItemView.js index ea6f12cae3..e622e821d8 100644 --- a/js/apps/system/aardvark/frontend/js/views/collectionsItemView.js +++ b/js/apps/system/aardvark/frontend/js/views/collectionsItemView.js @@ -79,11 +79,13 @@ { error: function() { arangoHelper.arangoError('Could not delete collection.'); + }, + success: function() { + window.modalView.hide(); } } ); this.collectionsView.render(); - window.modalView.hide(); }, saveModifiedCollection: function() { From 144c8b43e1ae061fe3023c18154fb8dd5f16d42f Mon Sep 17 00:00:00 2001 From: Heiko Kernbach Date: Fri, 10 Oct 2014 11:59:55 +0200 Subject: [PATCH 2/3] fixed display bug when a notification title is too long, optimized css for notifications --- js/apps/system/aardvark/frontend/scss/_notification.scss | 8 ++++++++ js/apps/system/aardvark/frontend/scss/generated.css | 8 +++++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/js/apps/system/aardvark/frontend/scss/_notification.scss b/js/apps/system/aardvark/frontend/scss/_notification.scss index 584a758046..17ce06f350 100644 --- a/js/apps/system/aardvark/frontend/scss/_notification.scss +++ b/js/apps/system/aardvark/frontend/scss/_notification.scss @@ -34,11 +34,19 @@ button { @extend %pull-right; margin-right: 5px; + margin-top: 5px; } .notificationItem { color: $c-black; + .notificationItemTitle { + max-width: 165px; + overflow-wrap: break-word; + white-space: normal; + word-wrap: break-word; + } + .notificationItemTitle:hover { color: #000; cursor: default; diff --git a/js/apps/system/aardvark/frontend/scss/generated.css b/js/apps/system/aardvark/frontend/scss/generated.css index 68e348d5d1..170b6795bb 100644 --- a/js/apps/system/aardvark/frontend/scss/generated.css +++ b/js/apps/system/aardvark/frontend/scss/generated.css @@ -4596,9 +4596,15 @@ pre.gv-object-view { width: 155px; word-wrap: break-word; } .fixedDropdown button { - margin-right: 5px; } + margin-right: 5px; + margin-top: 5px; } .fixedDropdown .notificationItem { color: #000; } + .fixedDropdown .notificationItem .notificationItemTitle { + max-width: 165px; + overflow-wrap: break-word; + white-space: normal; + word-wrap: break-word; } .fixedDropdown .notificationItem .notificationItemTitle:hover { color: #000; cursor: default; } From 75ef83e747646648bbe209ec5e71645914a03e4f Mon Sep 17 00:00:00 2001 From: Alan Plum Date: Fri, 10 Oct 2014 12:37:27 +0200 Subject: [PATCH 3/3] Added crypto stub. --- js/node/crypto.js | 1 + 1 file changed, 1 insertion(+) create mode 100644 js/node/crypto.js diff --git a/js/node/crypto.js b/js/node/crypto.js new file mode 100644 index 0000000000..e7db8a921f --- /dev/null +++ b/js/node/crypto.js @@ -0,0 +1 @@ +// not supported