#1 auto height for simfile list

diff --git a/app/components/uiSettings/uisettings-service.js b/app/components/uiSettings/uisettings-service.js
index 8c51782..28a0c89 100644 (file)
--- a/app/components/uiSettings/uisettings-service.js
+++ b/app/components/uiSettings/uisettings-service.js
@@ -9,13 +9,14 @@ factory("UiSettingsService", ['$localStorage', function($localStorage)
     $localStorage.$default({
         ui: {
             'simfilesPerPage': 10,
+            'simfilesPerPageAuto': true,
             'showDownloadWarning' : 'Yes'
         }
     });
     
     UiSettingsService.setDirective = function(directive, value)
     {
-        if($localStorage.ui[directive]) $localStorage.ui[directive] = value;
+        if($localStorage.ui.hasOwnProperty(directive)) $localStorage.ui[directive] = value;
     };
     
     UiSettingsService.getDirective = function(directive)

diff --git a/app/css/divinelegy.css b/app/css/divinelegy.css
index f479677..2ee1ccf 100644 (file)
--- a/app/css/divinelegy.css
+++ b/app/css/divinelegy.css
@@ -40,7 +40,7 @@ table {
     margin-bottom: 20px;
 }
 
-input, select {
+input[type="text"], select {
     box-sizing:content-box;
     -ms-box-sizing:content-box;
     -moz-box-sizing:content-box;

diff --git a/app/pages/account/account.html b/app/pages/account/account.html
index 4b74a34..93143fc 100644 (file)
--- a/app/pages/account/account.html
+++ b/app/pages/account/account.html
@@ -8,7 +8,9 @@
 </div>
 <div class="modal-body">
     <h2>Simfiles per page</h2>
-    <input type="text" ng-model="simfilesPerPage"/>
+    <input type="text" ng-model="simfilesPerPage" ng-disabled="simfilesPerPageAuto"/><br />
+    <label for="auto">Automatic</label>
+    <input name="auto" type="checkbox" ng-model="simfilesPerPageAuto"/>
     <h2>Download Warnings</h2>
     <select ng-model="downloadWarnings">
         <option value="Yes">Yes</option>

diff --git a/app/pages/account/account.js b/app/pages/account/account.js
index 19f8d86..30369c2 100644 (file)
--- a/app/pages/account/account.js
+++ b/app/pages/account/account.js
@@ -6,11 +6,13 @@ angular.module("DivinElegy.pages.account", ['DivinElegy.components.ui'])
 {
     $scope.hidden = true;
     $scope.simfilesPerPage = UiSettingsService.getDirective('simfilesPerPage');
+    $scope.simfilesPerPageAuto = UiSettingsService.getDirective('simfilesPerPageAuto');
     $scope.downloadWarnings = UiSettingsService.getDirective('showDownloadWarning');
     
     $scope.ok = function()
     {
         UiSettingsService.setDirective('simfilesPerPage', $scope.simfilesPerPage);
+        UiSettingsService.setDirective('simfilesPerPageAuto', $scope.simfilesPerPageAuto);
         UiSettingsService.setDirective('showDownloadWarning', $scope.downloadWarnings);
         $scope.hidden = false;
         $scope.messageType = 'success';

diff --git a/app/pages/packs/packs.js b/app/pages/packs/packs.js
index ece5f86..34bbcbf 100644 (file)
--- a/app/pages/packs/packs.js
+++ b/app/pages/packs/packs.js
@@ -2,7 +2,7 @@
 
 angular.module("DivinElegy.pages.packs", ["DivinElegy.components.simfiles","DivinElegy.components.user","DivinElegy.components.config","DivinElegy.components.ui", "ui.bootstrap"])
 
-.controller("PackController", ['$scope', 'SimfileService', 'UiSettingsService', 'filterFilter', '$routeParams', '$location', function($scope, SimfileService, UiSettingsService, filterFilter, $routeParams, $location)
+.controller("PackController", ['$scope', 'SimfileService', 'UiSettingsService', 'filterFilter', '$routeParams', '$location', '$window', function($scope, SimfileService, UiSettingsService, filterFilter, $routeParams, $location, $window)
 {
     $scope.packTitleFilterKeyword = null;
     $scope.artistFilterKeyWord = null;
@@ -151,7 +151,7 @@ angular.module("DivinElegy.pages.packs", ["DivinElegy.components.simfiles","Divi
 //            //TODO: 404 page?
 //            if(!$scope.pack) $location.path('/');
         } else {
-            $scope.pageSize = UiSettingsService.getDirective('simfilesPerPage');
+            $scope.pageSize = UiSettingsService.getDirective('simfilesPerPageAuto') ? Math.floor(($window.innerHeight - 280)/40) : UiSettingsService.getDirective('simfilesPerPage');
             $scope.currentPage = 1;
             $scope.packList = packs;
             $scope.filteredPackList = packs;