move group-click initialization to groups.js and only react on elements with a data...

diff --git a/settings/js/users/groups.js b/settings/js/users/groups.js
index 3ac8d3f36e3ef067519d82bebda1b3ac64499427..d939f0d3ad6dd83deb04485ab93b31f091ecf52f 100644 (file)
--- a/settings/js/users/groups.js
+++ b/settings/js/users/groups.js
@@ -75,7 +75,7 @@ $(document).ready( function () {
                        if (e.target.id !== 'newgroup-form') {
                                $("#newgroup-form").hide();
                                $("#newgroup-init").show();
-                       }                       
+                       }
                });
        });
 
@@ -120,6 +120,16 @@ $(document).ready( function () {
                        }
                )
        });
+
+       // click on group name
+       // FIXME: also triggered when clicking on "remove"
+       $('ul').on('click', 'li[data-gid]', function (event) {
+               var li = $(this);
+               var gid = $(li).attr('data-gid');
+               // Call function for handling delete/undo on Groups
+               GroupList.showGroup(gid);
+       });
+
        // Implements Groupname editing.
        $('#app-navigation').on('click', 'img.rename', function (event) {
                event.stopPropagation();

diff --git a/settings/js/users/users.js b/settings/js/users/users.js
index e82a6ceac13223417a29070a1c3f089056237051..e939d1d3bfc620d4e9607b5c6f909aa8daf7e24d 100644 (file)
--- a/settings/js/users/users.js
+++ b/settings/js/users/users.js
@@ -503,15 +503,6 @@ $(document).ready(function () {
                });
        });
 
-       // click on group name
-       // FIXME: also triggered when clicking on "remove"
-       $('ul').on('click', 'li', function (event) {
-               var li = $(this);
-               var gid = $(li).attr('data-gid');
-               // Call function for handling delete/undo on Groups
-               GroupList.showGroup(gid);
-       });
-
        $('#newuser').submit(function (event) {
                event.preventDefault();
                var username = $('#newusername').val();

diff --git a/settings/templates/users/part.grouplist.php b/settings/templates/users/part.grouplist.php
index 620049eb298c00dcc7a78e545a26cfa7a73443ff..6acf12a952f7607cdac1bc07994d3b70553b3cd4 100644 (file)
--- a/settings/templates/users/part.grouplist.php
+++ b/settings/templates/users/part.grouplist.php
@@ -12,7 +12,7 @@
                </form>
        </li>
        <!-- Everyone -->
-       <li>
+       <li data-gid="">
                <a href="#">
                        <span>
                                <?php p($l->t('Everyone')); ?>