js cleanup + typos

diff --git a/settings/js/users/filter.js b/settings/js/users/filter.js
index 89c2f46dacf235f08b1807b83b6ac3ea4ccd993c..3b04a8750cff77fda5dcb31d13beccb9da745487 100644 (file)
--- a/settings/js/users/filter.js
+++ b/settings/js/users/filter.js
@@ -5,7 +5,7 @@
  */
 
 /**
- * @brief this object takes care of the filter funcationality on the user
+ * @brief this object takes care of the filter functionality on the user
  * management page
  * @param jQuery input element that works as the user text input field
  * @param object the UserList object
@@ -24,9 +24,9 @@ function UserManagementFilter(filterInput, userList, groupList) {
  * @brief sets up when the filter action shall be triggered
  */
 UserManagementFilter.prototype.init = function() {
-       umf = this;
+       var umf = this;
        this.filterInput.keyup(function(e) {
-               //we want to react on any printable letter, plus on modyfing stuff like
+               //we want to react on any printable letter, plus on modifying stuff like
                //Backspace and Delete. extended https://stackoverflow.com/a/12467610
                var valid =
                        e.keyCode ===  0 || e.keyCode ===  8  || // like ö or ж; backspace
@@ -51,7 +51,7 @@ UserManagementFilter.prototype.init = function() {
                }
                umf.oldVal = umf.getPattern();
        });
-}
+};
 
 /**
  * @brief the filter action needs to be done, here the accurate steps are being
@@ -62,7 +62,7 @@ UserManagementFilter.prototype.run = function() {
        this.userList.update();
        this.groupList.empty();
        this.groupList.update();
-}
+};
 
 /**
  * @brief returns the filter String
@@ -70,4 +70,4 @@ UserManagementFilter.prototype.run = function() {
  */
 UserManagementFilter.prototype.getPattern = function() {
        return this.filterInput.val();
-}
\ No newline at end of file
+};

diff --git a/settings/js/users/groups.js b/settings/js/users/groups.js
index 1088467ca11a29a2dd3d949e0dbc54b307fc08b0..25b865cf18d4a337e8299a0ff2ff898c745f88d1 100644 (file)
--- a/settings/js/users/groups.js
+++ b/settings/js/users/groups.js
@@ -77,7 +77,7 @@
                                        GroupList.toggleAddGroup();
                                }
                        }
-               )
+               );
        },
 
        update: function() {
@@ -85,7 +85,7 @@
                        return;
                }
                GroupList.updating = true;
-               pattern = filter.getPattern();
+               var pattern = filter.getPattern();
                var query = $.param({ pattern: pattern });
                $.get(OC.generateUrl('/settings/ajax/grouplist') + '?' + query, function (result) {
                        var lis = [];
@@ -116,12 +116,12 @@
        },
 
        elementBelongsToAddGroup: function(el) {
-               return !(el !== $('#newgroup-form').get(0)
-                               && $('#newgroup-form').find($(el)).length === 0);
+               return !(el !== $('#newgroup-form').get(0) &&
+                               $('#newgroup-form').find($(el)).length === 0);
        },
 
        hasAddGroupNameText: function() {
-               name = $('#newgroupname').val();
+               var name = $('#newgroupname').val();
                if($.trim(name) === '') {
                        return false;
                }
@@ -158,7 +158,7 @@
        isGroupNameValid: function(groupname) {
                if ($.trim(groupname) === '') {
                        OC.dialogs.alert(
-                               t('settings', 'A valid groupname must be provided'),
+                               t('settings', 'A valid group name must be provided'),
                                t('settings', 'Error creating group'));
                        return false;
                }
@@ -184,15 +184,15 @@
 
                //configure undo
                OC.Notification.hide();
-               msg = t('settings', 'deleted') + ' %oid <span class="undo">' +
-                         t('settings', 'undo') + '</span>';
+               var msg = t('settings', 'deleted') + ' %oid <span class="undo">' +
+                       t('settings', 'undo') + '</span>';
                GroupDeleteHandler.setNotification(OC.Notification, 'deletegroup', msg,
-                                                                                 GroupList.show);
+                                                                               GroupList.show);
 
                //when to mark user for delete
-               $('ul').on('click', 'span.utils>a', function (event) {
+               $('ul').on('click', 'span.utils>a', function () {
                        // Call function for handling delete/undo
-                       gid = $(this).parent().parent().attr('data-gid');
+                       var gid = $(this).parent().parent().attr('data-gid');
                        GroupDeleteHandler.mark(gid);
                });
 
@@ -201,8 +201,8 @@
                $(window).on('beforeunload', function () {
                        GroupDeleteHandler.delete();
                });
-       },
-}
+       }
+};
 
 $(document).ready( function () {
        GroupList.initDeleteHandling();
@@ -214,9 +214,9 @@ $(document).ready( function () {
        });
 
        $(document).on('click keydown keyup', function(event) {
-               if(!GroupList.isAddGroupButtonVisible()
-                       && !GroupList.elementBelongsToAddGroup(event.target)
-                   && !GroupList.hasAddGroupNameText()) {
+               if(!GroupList.isAddGroupButtonVisible() &&
+                       !GroupList.elementBelongsToAddGroup(event.target) &&
+                       !GroupList.hasAddGroupNameText()) {
                        GroupList.toggleAddGroup();
                }
                // Escape
@@ -236,7 +236,7 @@ $(document).ready( function () {
 
        // click on group name
        // FIXME: also triggered when clicking on "remove"
-       $('ul').on('click', 'li[data-gid]', function (event) {
+       $('ul').on('click', 'li[data-gid]', function () {
                var li = $(this);
                var gid = $(li).attr('data-gid');
                GroupList.showGroup(gid);
@@ -296,6 +296,6 @@ $(document).ready( function () {
 });
 
 var wrongKey = function(event) {
-       return ((event.type === 'keydown' || event.type === 'keypress') 
-               && (event.keyCode !== 32 && event.keyCode !== 13));
-};
\ No newline at end of file
+       return ((event.type === 'keydown' || event.type === 'keypress') &&
+               (event.keyCode !== 32 && event.keyCode !== 13));
+};