editing

3 files changed, 45 insertions, 3 deletions

diff --git a/js/directive/AppNavigationEntryUtils.js b/js/directive/AppNavigationEntryUtils.js
new file mode 100644
index 000000000..8deb09b61
--- /dev/null
+++ b/js/directive/AppNavigationEntryUtils.js
@@ -0,0 +1,38 @@
+/**
+ * ownCloud - News
+ *
+ * This file is licensed under the Affero General Public License version 3 or
+ * later. See the COPYING file.
+ *
+ * @author Bernhard Posselt <dev@bernhard-posselt.com>
+ * @copyright Bernhard Posselt 2014
+ */
+app.run(($document, $rootScope) => {
+    'use strict';
+    $document.click((event) => {
+        $rootScope.$broadcast('documentClicked', event);
+    });
+});
+
+app.directive('appNavigationEntryUtils', () => {
+    'use strict';
+    return {
+        restrict: 'C',
+        link: (scope, elm) => {
+            let menu = elm.siblings('.app-navigation-entry-menu');
+            menu.hide();
+            let button = $(elm)
+                .find('.app-navigation-entry-utils-menu-button button');
+
+            button.click(() => {
+                menu.toggle();
+            });
+
+            scope.$on('documentClicked', (scope, event) => {
+                if (event.target !== button[0]) {
+                    menu.hide();
+                }
+            });
+        }
+    };
+});
\ No newline at end of file
diff --git a/js/directive/NewsAutoFocus.js b/js/directive/NewsAutoFocus.js
index a66f4453c..e66f7b3bf 100644
--- a/js/directive/NewsAutoFocus.js
+++ b/js/directive/NewsAutoFocus.js
@@ -11,7 +11,11 @@ app.directive('newsAutoFocus', () => {
     'use strict';
 
     return (scope, elem, attrs) => {
-        $(attrs.newsAutofocus).focus();
+        if (attrs.newsAutofocus) {
+            $(attrs.newsAutofocus).focus();
+        } else {
+            elem.focus();
+        }
     };
 
 });
\ No newline at end of file
diff --git a/js/directive/NewsFocus.js b/js/directive/NewsFocus.js
index 3ab2a85aa..f5133fd20 100644
--- a/js/directive/NewsFocus.js
+++ b/js/directive/NewsFocus.js
@@ -7,12 +7,12 @@
  * @author Bernhard Posselt <dev@bernhard-posselt.com>
  * @copyright Bernhard Posselt 2014
  */
-app.directive('newsFocus', ($timeout) => {
+app.directive('newsFocus', ($timeout, $interpolate) => {
     'use strict';
 
     return (scope, elem, attrs) => {
         elem.click(() => {
-            let toReadd = $(attrs.newsFocus);
+            let toReadd = $($interpolate(attrs.newsFocus)(scope));
             $timeout(() => {
                 toReadd.focus();
             }, 500);