util refactoring: moved files to folders

app/scripts/app.js

@@ -2,11 +2,11 @@
 
 var AppModel = require('./models/app-model'),
     AppView = require('./views/app-view'),
-    KeyHandler = require('./util/key-handler'),
-    Alerts = require('./util/alerts');
+    KeyHandler = require('./comp/key-handler'),
+    Alerts = require('./comp/alerts');
 
 $(function() {
-    require('./util/view');
+    require('./mixins/view');
     KeyHandler.init();
     if (['https:', 'file:', 'app:'].indexOf(location.protocol) < 0) {
         Alerts.error({ header: 'Not Secure!', icon: 'user-secret', esc: false, enter: false, click: false,

app/scripts/comp/runtime-info.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var Launcher = require('./launcher');
+var Launcher = require('../comp/launcher');
 
 var RuntimeInfo = {
     version: '@@VERSION',

app/scripts/models/file-model.js

@@ -3,7 +3,7 @@
 var Backbone = require('backbone'),
     GroupCollection = require('../collections/group-collection'),
     GroupModel = require('./group-model'),
-    Launcher = require('../util/launcher'),
+    Launcher = require('../comp/launcher'),
     kdbxweb = require('kdbxweb'),
     demoFileData = require('base64!../../resources/Demo.kdbx');
 

app/scripts/util/password-display.js

@@ -1,9 +0,0 @@
-'use strict';
-
-var PasswordDisplay = {
-    present: function(length) {
-        return new Array(length + 1).join('•');
-    }
-};
-
-module.exports = PasswordDisplay;

app/scripts/util/password-generator.js

@@ -30,6 +30,9 @@ var PasswordGenerator = {
             chars.push(range[rand % range.length]);
         }
         return _.shuffle(chars).join('');
+    },
+    present: function(length) {
+        return new Array(length + 1).join('•');
     }
 };
 

app/scripts/views/app-view.js

@@ -8,10 +8,10 @@ var Backbone = require('backbone'),
     DetailsView = require('../views/details/details-view'),
     OpenView = require('../views/open-view'),
     SettingsView = require('../views/settings/settings-view'),
-    Alerts = require('../util/alerts'),
+    Alerts = require('../comp/alerts'),
     Keys = require('../const/keys'),
-    KeyHandler = require('../util/key-handler'),
-    Launcher = require('../util/launcher');
+    KeyHandler = require('../comp/key-handler'),
+    Launcher = require('../comp/launcher');
 
 var AppView = Backbone.View.extend({
     el: 'body',

app/scripts/views/details/details-history-view.js

@@ -1,10 +1,10 @@
 'use strict';
 
 var Backbone = require('backbone'),
-    KeyHandler = require('../../util/key-handler'),
+    KeyHandler = require('../../comp/key-handler'),
     Keys = require('../../const/keys'),
     Format = require('../../util/format'),
-    Alerts = require('../../util/alerts'),
+    Alerts = require('../../comp/alerts'),
     FieldViewReadOnly = require('../fields/field-view-read-only'),
     FieldViewReadOnlyRaw = require('../fields/field-view-read-only-raw');
 

app/scripts/views/details/details-view.js

@@ -1,7 +1,7 @@
 'use strict';
 
 var Backbone = require('backbone'),
-    Scrollable = require('../../util/scrollable'),
+    Scrollable = require('../../mixins/scrollable'),
     FieldViewText = require('../fields/field-view-text'),
     FieldViewDate = require('../fields/field-view-date'),
     FieldViewTags = require('../fields/field-view-tags'),
@@ -13,7 +13,7 @@ var Backbone = require('backbone'),
     DetailsHistoryView = require('./details-history-view'),
     DetailsAttachmentView = require('./details-attachment-view'),
     Keys = require('../../const/keys'),
-    KeyHandler = require('../../util/key-handler'),
+    KeyHandler = require('../../comp/key-handler'),
     CopyPaste = require('../../util/copy-paste'),
     Format = require('../../util/format'),
     FileSaver = require('filesaver'),

app/scripts/views/fields/field-view-text.js

@@ -3,12 +3,12 @@
 var FieldView = require('./field-view'),
     GeneratorView = require('../generator-view'),
     Keys = require('../../const/keys'),
-    PasswordDisplay = require('../../util/password-display'),
+    PasswordGenerator = require('../../util/password-generator'),
     kdbxweb = require('kdbxweb');
 
 var FieldViewText = FieldView.extend({
     renderValue: function(value) {
-        return typeof value.byteLength === 'number' ? PasswordDisplay.present(value.byteLength) :
+        return typeof value.byteLength === 'number' ? PasswordGenerator.present(value.byteLength) :
             _.escape(value).replace(/\n/g, '<br/>');
     },
 

app/scripts/views/footer-view.js

@@ -2,7 +2,7 @@
 
 var Backbone = require('backbone'),
     Keys = require('../const/keys'),
-    KeyHandler = require('../util/key-handler'),
+    KeyHandler = require('../comp/key-handler'),
     GeneratorView = require('./generator-view');
 
 var FooterView = Backbone.View.extend({

app/scripts/views/list-search-view.js

@@ -2,7 +2,7 @@
 
 var Backbone = require('backbone'),
     Keys = require('../const/keys'),
-    KeyHandler = require('../util/key-handler'),
+    KeyHandler = require('../comp/key-handler'),
     DropdownView = require('./dropdown-view'),
     FeatureDetector = require('../util/feature-detector');
 
@@ -178,7 +178,7 @@ var ListSearchView = Backbone.View.extend({
     },
 
     advancedSearchClick: function() {
-        require('../util/alerts').notImplemented();
+        require('../comp/alerts').notImplemented();
     },
 
     toggleMenu: function() {

app/scripts/views/list-view.js

@@ -1,8 +1,8 @@
 'use strict';
 
 var Backbone = require('backbone'),
-    Resizable = require('../util/resizable'),
-    Scrollable = require('../util/scrollable'),
+    Resizable = require('../mixins/resizable'),
+    Scrollable = require('../mixins/scrollable'),
     ListSearchView = require('./list-search-view'),
     EntryPresenter = require('../presenters/entry-presenter'),
     baron = require('baron');

app/scripts/views/menu/menu-item-view.js

@@ -1,9 +1,9 @@
 'use strict';
 
 var Backbone = require('backbone'),
-    KeyHandler = require('../../util/key-handler'),
+    KeyHandler = require('../../comp/key-handler'),
     Keys = require('../../const/keys'),
-    Alerts = require('../../util/alerts');
+    Alerts = require('../../comp/alerts');
 
 var MenuItemView = Backbone.View.extend({
     template: require('templates/menu/menu-item.html'),

app/scripts/views/menu/menu-section-view.js

@@ -2,8 +2,8 @@
 
 var Backbone = require('backbone'),
     MenuItemView = require('./menu-item-view'),
-    Resizable = require('../../util/resizable'),
-    Scrollable = require('../../util/scrollable'),
+    Resizable = require('../../mixins/resizable'),
+    Scrollable = require('../../mixins/scrollable'),
     baron = require('baron');
 
 var MenuSectionView = Backbone.View.extend({

app/scripts/views/menu/menu-view.js

@@ -1,7 +1,7 @@
 'use strict';
 
 var Backbone = require('backbone'),
-    Resizable = require('../../util/resizable'),
+    Resizable = require('../../mixins/resizable'),
     MenuSectionView = require('./menu-section-view'),
     DragView = require('../drag-view');
 

app/scripts/views/modal-view.js

@@ -2,7 +2,7 @@
 
 var Backbone = require('backbone'),
     Keys = require('../const/keys'),
-    KeyHandler = require('../util/key-handler');
+    KeyHandler = require('../comp/key-handler');
 
 var ModalView = Backbone.View.extend({
     el: 'body',

app/scripts/views/open-file-view.js

@@ -2,8 +2,8 @@
 
 var Backbone = require('backbone'),
     Keys = require('../const/keys'),
-    Alerts = require('../util/alerts'),
-    SecureInput = require('../util/secure-input');
+    Alerts = require('../comp/alerts'),
+    SecureInput = require('../comp/secure-input');
 
 var OpenFileView = Backbone.View.extend({
     template: require('templates/open-file.html'),

app/scripts/views/open-view.js

@@ -3,7 +3,7 @@
 var Backbone = require('backbone'),
     OpenFileView = require('./open-file-view'),
     FileModel = require('../models/file-model'),
-    Launcher = require('../util/launcher');
+    Launcher = require('../comp/launcher');
 
 var OpenView = Backbone.View.extend({
     template: require('templates/open.html'),

app/scripts/views/settings/settings-about-view.js

@@ -1,7 +1,7 @@
 'use strict';
 
 var Backbone = require('backbone'),
-    RuntimeInfo = require('../../util/runtime-info'),
+    RuntimeInfo = require('../../comp/runtime-info'),
     Links = require('../../const/links');
 
 var SettingsAboutView = Backbone.View.extend({

app/scripts/views/settings/settings-file-view.js

@@ -3,10 +3,10 @@
 var Backbone = require('backbone'),
     AppSettingsModel = require('../../models/app-settings-model'),
     FeatureDetector = require('../../util/feature-detector'),
-    PasswordDisplay = require('../../util/password-display'),
-    Alerts = require('../../util/alerts'),
-    RuntimeInfo = require('../../util/runtime-info'),
-    Launcher = require('../../util/launcher'),
+    PasswordGenerator = require('../../util/password-generator'),
+    Alerts = require('../../comp/alerts'),
+    RuntimeInfo = require('../../comp/runtime-info'),
+    Launcher = require('../../comp/launcher'),
     Links = require('../../const/links'),
     kdbxweb = require('kdbxweb'),
     FileSaver = require('filesaver');
@@ -42,7 +42,7 @@ var SettingsAboutView = Backbone.View.extend({
 
             name: this.model.get('name'),
             path: this.model.get('path'),
-            password: PasswordDisplay.present(this.model.get('passwordLength')),
+            password: PasswordGenerator.present(this.model.get('passwordLength')),
             defaultUser: this.model.get('defaultUser'),
             recycleBinEnabled: this.model.get('recycleBinEnabled'),
             historyMaxItems: this.model.get('historyMaxItems'),
@@ -204,7 +204,7 @@ var SettingsAboutView = Backbone.View.extend({
         if (!e.target.value) {
             this.passwordChanged = false;
             this.model.resetPassword();
-            e.target.value = PasswordDisplay.present(this.model.get('passwordLength'));
+            e.target.value = PasswordGenerator.present(this.model.get('passwordLength'));
             this.$el.find('.settings__file-master-pass-warning').hide();
         } else {
             this.passwordChanged = true;

app/scripts/views/settings/settings-general-view.js

@@ -1,7 +1,7 @@
 'use strict';
 
 var Backbone = require('backbone'),
-    Launcher = require('../../util/launcher'),
+    Launcher = require('../../comp/launcher'),
     AppSettingsModel = require('../../models/app-settings-model');
 
 var SettingsGeneralView = Backbone.View.extend({

app/scripts/views/settings/settings-help-view.js

@@ -1,7 +1,7 @@
 'use strict';
 
 var Backbone = require('backbone'),
-    RuntimeInfo = require('../../util/runtime-info'),
+    RuntimeInfo = require('../../comp/runtime-info'),
     Links = require('../../const/links');
 
 var SettingsHelpView = Backbone.View.extend({

app/scripts/views/settings/settings-view.js

@@ -1,9 +1,9 @@
 'use strict';
 
 var Backbone = require('backbone'),
-    Scrollable = require('../../util/scrollable'),
+    Scrollable = require('../../mixins/scrollable'),
     Keys = require('../../const/keys'),
-    KeyHandler = require('../../util/key-handler'),
+    KeyHandler = require('../../comp/key-handler'),
     baron = require('baron');
 
 var SettingsView = Backbone.View.extend({