editing

6 files changed, 85 insertions, 6 deletions

diff --git a/js/app/Run.js b/js/app/Run.js
index 44c01a5e5..9b068910c 100644
--- a/js/app/Run.js
+++ b/js/app/Run.js
@@ -105,4 +105,5 @@ app.run(($rootScope, $location, $http, $q, $interval, Loading, ItemResource,
     $rootScope.$on('$routeChangeError', () => {
         $location.path('/items');
     });
+
 });
\ No newline at end of file
diff --git a/js/build/app.js b/js/build/app.js
index a3a749132..c718e3c2c 100644
--- a/js/build/app.js
+++ b/js/build/app.js
@@ -1536,6 +1536,35 @@ var $__build_47_app__ = function () {
           writable: true
         }), $__2;
       };
+      app.run([
+        '$document',
+        '$rootScope',
+        function ($document, $rootScope) {
+          'use strict';
+          $document.click(function (event) {
+            $rootScope.$broadcast('documentClicked', event);
+          });
+        }
+      ]);
+      app.directive('appNavigationEntryUtils', function () {
+        'use strict';
+        return {
+          restrict: 'C',
+          link: function (scope, elm) {
+            var menu = elm.siblings('.app-navigation-entry-menu');
+            menu.hide();
+            var button = $(elm).find('.app-navigation-entry-utils-menu-button button');
+            button.click(function () {
+              menu.toggle();
+            });
+            scope.$on('documentClicked', function (scope, event) {
+              if (event.target !== button[0]) {
+                menu.hide();
+              }
+            });
+          }
+        };
+      });
       app.directive('newsAudio', function () {
         'use strict';
         return {
@@ -1563,7 +1592,11 @@ var $__build_47_app__ = function () {
       app.directive('newsAutoFocus', function () {
         'use strict';
         return function (scope, elem, attrs) {
-          $(attrs.newsAutofocus).focus();
+          if (attrs.newsAutofocus) {
+            $(attrs.newsAutofocus).focus();
+          } else {
+            elem.focus();
+          }
         };
       });
       app.directive('newsBindHtmlUnsafe', function () {
@@ -1610,11 +1643,12 @@ var $__build_47_app__ = function () {
       ]);
       app.directive('newsFocus', [
         '$timeout',
-        function ($timeout) {
+        '$interpolate',
+        function ($timeout, $interpolate) {
           'use strict';
           return function (scope, elem, attrs) {
             elem.click(function () {
-              var toReadd = $(attrs.newsFocus);
+              var toReadd = $($interpolate(attrs.newsFocus)(scope));
               $timeout(function () {
                 toReadd.focus();
               }, 500);
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);
diff --git a/js/tests/unit/controller/NavigationControllerSpec.js b/js/tests/unit/controller/NavigationControllerSpec.js
index 6837160bf..1cfbb4012 100644
--- a/js/tests/unit/controller/NavigationControllerSpec.js
+++ b/js/tests/unit/controller/NavigationControllerSpec.js
@@ -278,4 +278,6 @@ describe('NavigationController', () => {
 
         expect(ctrl.isFolderActive(3)).toBe(true);
     }));
+
+
 });