adapt-authoring-ui 3.0.1 → 3.0.3

package/app/modules/editor/themeEditor/views/editorThemingView.js

@@ -164,8 +164,9 @@ define(function(require) {
       }, {
         success: model => {
           this.presets.add(model);
+          this.updatePresetSelect();
           this.updateRestorePresetButton(false);
-          window.setTimeout(() => this.$('.preset select').val(model.get('_id')), 1);
+          this.$('.preset select').val(model.get('_id'));
         },
         error: this.onError
       });

package/app/modules/projects/views/projectsView.js

@@ -185,33 +185,24 @@ define(function(require){
       });
     },
 
+    isNearListBottom: function(buffer) {
+      const cp = $('.contentPane')[0];
+      if(!cp) return false;
+      return cp.scrollHeight - cp.scrollTop - cp.clientHeight <= buffer;
+    },
+
     checkAndFillVisibleArea: function() {
-      // Check if we need to load more items to fill the viewport
+      // Trigger another fetch when current items don't overflow the viewport
       if(this.shouldStopFetches || this.isCollectionFetching) return;
-
-      const $last = $('.project-list-item').last();
-      if($last.length === 0) return;
-
-      const $contentPane = $('.contentPane');
-      if($contentPane.length === 0) return;
-
-      const contentPaneBottom = $contentPane.scrollTop() + $contentPane.height();
-      const lastItemBottom = $last.position().top + $last.outerHeight(true);
-
-      // If the last item is visible (within the viewport), fetch more
-      if(lastItemBottom <= contentPaneBottom) {
-        this.fetchCollection();
-      }
+      if(this.isNearListBottom(0)) this.fetchCollection();
     },
 
-    doLazyScroll: function(e) {
-      if(this.isCollectionFetching) {
-        return;
-      }
-      const $last = $('.project-list-item').last();
-      const triggerY = ($('.contentPane').offset().top + $('.contentPane').height()) - ($last.height()/2) ;
-
-      if($last.offset().top < triggerY) this.fetchCollection();
+    doLazyScroll: function() {
+      // Trigger when user scrolls within one viewport of the bottom
+      if(this.isCollectionFetching || this.shouldStopFetches) return;
+      const cp = $('.contentPane')[0];
+      if(!cp) return;
+      if(this.isNearListBottom(cp.clientHeight)) this.fetchCollection();
     },
 
     doLayout: function(layout) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "adapt-authoring-ui",
-  "version": "3.0.1",
+  "version": "3.0.3",
   "description": "Front-end application for the Adapt authoring tool",
   "homepage": "https://github.com/adapt-security/adapt-authoring-ui",
   "license": "GPL-3.0",