Merge pull request #252 from Pitros/updated-infinite-scroll

weblancaster · weblancaster · commit e14ffc78f7ca · 2015-06-04T16:38:56.000-05:00
Infinite scroll change
diff --git a/app/public/js/app.js b/app/public/js/app.js
@@ -64,4 +64,4 @@ app.run(function($rootScope, $log, SCapiService, hotkeys) {
 
 });
 
-angular.module('infinite-scroll').value('THROTTLE_MILLISECONDS', 1500);
+angular.module('infinite-scroll').value('THROTTLE_MILLISECONDS', 200);
diff --git a/app/public/js/vendor/ng-infinite-scroll.min.js b/app/public/js/vendor/ng-infinite-scroll.min.js
diff --git a/app/public/stylesheets/sass/_components/_appContainer.scss b/app/public/stylesheets/sass/_components/_appContainer.scss
@@ -3,6 +3,7 @@
   background: $bodyBackground;
   overflow-x: hidden;
   position: relative;
+  height: 100%;
 }
 
 .fa {
diff --git a/app/public/stylesheets/sass/_components/_view-container.scss b/app/public/stylesheets/sass/_components/_view-container.scss
@@ -2,6 +2,9 @@
   // flex: 5 0 0;
   padding: 10px 20px;
   margin-left: 200px;
+  overflow-y: scroll;
+  overflow-x: hidden;
+  height: 100%;
 
   & > div {
     max-width: 100%;
diff --git a/app/views/favorites/favorites.html b/app/views/favorites/favorites.html
@@ -6,7 +6,7 @@ <h1> {{ title }}</h1>
         <ul class="songList"
             infinite-scroll='loadMore()'
             infinite-scroll-distance='0'
-            infinite-scroll-disabled='{{ busy }}'
+            infinite-scroll-container='".mainView"'
             infinite-scroll-immediate-check='false' >
 
             <li class="songList_item" ng-repeat="data in data"
diff --git a/app/views/profile/profile.html b/app/views/profile/profile.html
@@ -19,7 +19,7 @@ <h2>Tracks:</h2><br>
         <ul class="songList"
             infinite-scroll='loadMore()'
             infinite-scroll-distance='0'
-            infinite-scroll-disabled='{{ busy }}'
+            infinite-scroll-container='".mainView"'
             infinite-scroll-immediate-check='false' >
 
             <li class="songList_item" ng-repeat="data in data"
diff --git a/app/views/search/search.html b/app/views/search/search.html
@@ -7,7 +7,7 @@ <h1> {{ title }} {{ keyword }}</h1>
         <ul class="songList"
             infinite-scroll='loadMore()'
             infinite-scroll-distance='0'
-            infinite-scroll-disabled='{{ busy }}'
+            infinite-scroll-container='".mainView"'
             infinite-scroll-immediate-check='false'>
 
             <li class="songList_item" ng-repeat="data in data"
diff --git a/app/views/stream/stream.html b/app/views/stream/stream.html
@@ -6,7 +6,7 @@ <h1> {{ title }}</h1>
         <ul class="songList" 
             infinite-scroll='loadMore()' 
             infinite-scroll-distance='0'
-            infinite-scroll-disabled='{{ busy }}'
+            infinite-scroll-container='".mainView"'
             infinite-scroll-immediate-check='false' >
 
             <li class="songList_item" ng-repeat="data in data"
diff --git a/app/views/tracks/tracks.html b/app/views/tracks/tracks.html
@@ -8,7 +8,7 @@ <h1> {{ title }}</h1>
         <ul class="songList"
             infinite-scroll='loadMore()'
             infinite-scroll-distance='0'
-            infinite-scroll-disabled='{{ busy }}'
+            infinite-scroll-container='".mainView"'
             infinite-scroll-immediate-check='false' >
 
             <li class="songList_item" ng-repeat="data in data"

Original file line number	Diff line number	Diff line change
`@@ -64,4 +64,4 @@ app.run(function($rootScope, $log, SCapiService, hotkeys) {`
`64`	`64`
`65`	`65`	`});`
`66`	`66`
`67`		`-angular.module('infinite-scroll').value('THROTTLE_MILLISECONDS', 1500);`
	`67`	`+angular.module('infinite-scroll').value('THROTTLE_MILLISECONDS', 200);`
Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@`
`3`	`3`	`background: $bodyBackground;`
`4`	`4`	`overflow-x: hidden;`
`5`	`5`	`position: relative;`
	`6`	`+ height: 100%;`
`6`	`7`	`}`
`7`	`8`
`8`	`9`	`.fa {`