@progress/telerik-jquery-report-viewer 22.24.514 → 22.24.709

package/dist/cjs/mainMenu.js

@@ -48,9 +48,9 @@ function MainMenu(dom, rootOptions, otherOptions) {
     replaceStringResources();
   }
   function setTabIndexes() {
-    var $menus = $.find('[data-role="telerik_ReportViewer_MainMenu"]');
-    utils.each($menus, function() {
-      var $menuArea = $(this);
+    var $menus = $('[data-role="telerik_ReportViewer_MainMenu"]');
+    Array.from($menus).forEach((menu2) => {
+      var $menuArea = $(menu2);
       var listItems = $menuArea.find("li");
       var menuTabIndex = 0;
       var tabIndexAttr = $menuArea.attr("tabIndex");
@@ -68,13 +68,13 @@ function MainMenu(dom, rootOptions, otherOptions) {
     });
   }
   function setMenuItemsTabIndexes(listItems, menuTabIndex) {
-    utils.each(listItems, function() {
-      var $item = $(this);
+    Array.from(listItems).forEach((item) => {
+      var $item = $(item);
       $item.attr("tabindex", menuTabIndex);
-      $item.focus(function() {
+      $item.on("focus", (event) => {
         $item.addClass("k-focus");
       });
-      $item.blur(function() {
+      $item.on("blur", (event) => {
         $item.removeClass("k-focus");
       });
       var anchor = $item.children("a");
@@ -93,16 +93,15 @@ function MainMenu(dom, rootOptions, otherOptions) {
     });
   }
   function fillFormats(formats) {
-    utils.each($(dom).find("ul[data-command-list=export-format-list]"), function() {
-      var $list = $(this);
+    Array.from($(dom).find("ul[data-command-list=export-format-list]")).forEach((list) => {
+      var $list = $(list);
       var $parent = $list.parents("li");
       var tabIndex = enableAccessibility ? $parent.attr("tabindex") : -1;
       if (!tabIndex) {
         tabIndex = 1;
       }
       $list.empty();
-      utils.each(formats, function() {
-        var format = this;
+      Array.from(formats).forEach((format) => {
         var ariaLabel = enableAccessibility ? utils.stringFormat('aria-label="{localizedName}" ', format) : " ";
         var li = "<li " + ariaLabel + utils.stringFormat('tabindex="' + tabIndex + '"><a tabindex="-1" href="#" data-command="telerik_ReportViewer_export" data-command-parameter="{name}"><span>{localizedName}</span></a></li>', format);
         menu.append(li, $parent);
@@ -113,10 +112,10 @@ function MainMenu(dom, rootOptions, otherOptions) {
     });
   }
   function setInternalListAccessibilityKeyEvents(listItems) {
-    utils.each(listItems, function() {
-      var $item = $(this);
+    Array.from(listItems).forEach((item) => {
+      var $item = $(item);
       $item.off("keydown");
-      $item.on("keydown", function(event) {
+      $item.on("keydown", (event) => {
         switch (event.which) {
           case kendo.keys.ENTER:
             clickOnMenuItem($item);
@@ -124,17 +123,17 @@ function MainMenu(dom, rootOptions, otherOptions) {
           case kendo.keys.UP:
             var $prev = $item.prev();
             if ($prev.length > 0) {
-              $prev.focus();
+              $prev.trigger("focus");
             } else {
-              $item.parents("li").focus();
+              $item.parents("li").trigger("focus");
             }
             break;
           case kendo.keys.DOWN:
             var $next = $item.next();
             if ($next.length > 0) {
-              $next.focus();
+              $next.trigger("focus");
             } else {
-              $item.parent().children("li").first().focus();
+              $item.parent().children("li").first().trigger("focus");
             }
             break;
         }
@@ -298,12 +297,12 @@ function MainMenu(dom, rootOptions, otherOptions) {
     if (!menuAreas) {
       return;
     }
-    utils.each(menuAreas, function() {
-      var $menu = $(this);
+    Array.from(menuAreas).forEach((menu2) => {
+      var $menu = $(menu2);
       var menuItems = $menu.children("li.k-item");
       $menu.attr("aria-label", stringResources.stringResources[$menu.attr("aria-label")]);
-      utils.each(menuItems, function() {
-        var $menuItem = $(this);
+      Array.from(menuItems).forEach((menuItem) => {
+        var $menuItem = $(menuItem);
         $menuItem.attr("aria-label", stringResources.stringResources[$menuItem.attr("aria-label")]);
         if (!$menuItem.hasClass("trv-report-pager")) {
           var $a = $menuItem.find("a");
@@ -317,16 +316,8 @@ function MainMenu(dom, rootOptions, otherOptions) {
     });
   }
   function findMenuArea() {
-    return utils.findElement("ul[data-role=telerik_ReportViewer_MainMenu]");
+    return $("ul[data-role=telerik_ReportViewer_MainMenu]");
   }
 }
-var pluginName = "telerik_ReportViewer_MainMenu";
-$.fn[pluginName] = function(options, otherOptions) {
-  return utils.each(this, function() {
-    if (!$.data(this, pluginName)) {
-      $.data(this, pluginName, new MainMenu(this, options, otherOptions));
-    }
-  });
-};
 
 exports.MainMenu = MainMenu;

package/dist/cjs/pagesArea.js

@@ -37,7 +37,7 @@ function PagesArea(placeholder, options, otherOptions) {
   var reportPageIsLoaded = false;
   var pageAreaImageStyle = '.trv-page-container {background: #ffffff url("{0}") no-repeat center 50px}';
   var pageAreaImageID = "trv-initial-image-styles";
-  var scroll$1 = utils.extend({}, scroll.Scroll, {});
+  var scroll$1 = $.extend({}, scroll.Scroll);
   var uiFreezeCoordinator$1 = null;
   init();
   if (scroll$1) {
@@ -123,7 +123,7 @@ function PagesArea(placeholder, options, otherOptions) {
       enableInteractivity();
     }
     if (args.containsFrozenContent && !uiFreezeCoordinator$1) {
-      uiFreezeCoordinator$1 = utils.extend({}, uiFreezeCoordinator.UIFreezeCoordinator, {});
+      uiFreezeCoordinator$1 = $.extend({}, uiFreezeCoordinator.UIFreezeCoordinator);
       if (controller.getViewMode() === enums.ViewModes.INTERACTIVE) {
         uiFreezeCoordinator$1.init($placeholder);
       }
@@ -263,19 +263,13 @@ function PagesArea(placeholder, options, otherOptions) {
     var result;
     var allPages = $pageContainer.find(".trv-report-page");
     if (controller.getPageMode() === enums.PageModes.SINGLE_PAGE) {
-      utils.each(allPages, function(index, page) {
-        if (pageNo(page) === pageNumber) {
-          result = page;
-        }
-        return !result;
+      result = Array.from(allPages).find((page) => {
+        return pageNo(page) === pageNumber;
       });
     } else {
-      $.each(allPages, function(index, page) {
+      result = Array.from(allPages).find((page) => {
         var dataPageNumber = parseInt($(page).attr("data-page"));
-        if (dataPageNumber === pageNumber) {
-          result = page;
-          return false;
-        }
+        return dataPageNumber === pageNumber;
       });
     }
     return result;
@@ -487,14 +481,9 @@ function PagesArea(placeholder, options, otherOptions) {
   }
   function getAction(actionId) {
     if (actions) {
-      var action;
-      utils.each(actions, function() {
-        if (this.Id === actionId) {
-          action = this;
-        }
-        return action === void 0;
+      return Array.from(actions).find(function(action) {
+        return action.Id === actionId;
       });
-      return action;
     }
     return null;
   }
@@ -629,13 +618,5 @@ function PagesArea(placeholder, options, otherOptions) {
     $("#" + pageAreaImageID).remove();
   }
 }
-var pluginName = "telerik_ReportViewer_PagesArea";
-$.fn[pluginName] = function(options, otherOptions) {
-  return utils.each(this, function() {
-    if (!$.data(this, pluginName)) {
-      $.data(this, pluginName, new PagesArea(this, options, otherOptions));
-    }
-  });
-};
 
 exports.PagesArea = PagesArea;

package/dist/cjs/parameterValidators.js

@@ -16,9 +16,8 @@ var ParameterValidators = function() {
       if (value == null || value.length == 0) {
         if (parameter.allowNull) {
           return value;
-        } else {
-          throw stringResources.stringResources.invalidParameter;
         }
+        throw stringResources.stringResources.invalidParameter;
       }
       return values;
     }
@@ -29,10 +28,8 @@ var ParameterValidators = function() {
   }
   function checkAvailableValues(parameter, value, compareFunc) {
     if (parameter.availableValues) {
-      var found = false;
-      utils.each(parameter.availableValues, function(i, av) {
-        found = compareFunc(value, av.value);
-        return !found;
+      var found = Array.from(parameter.availableValues).some(function(av) {
+        return compareFunc(value, av.value);
       });
       if (!found) {
         if (parameter.allowNull && !value) {
@@ -139,7 +136,7 @@ var ParameterValidators = function() {
         parameter,
         value,
         function(value2) {
-          if (-1 != ["true", "false"].indexOf(("" + value2).toLowerCase())) {
+          if (-1 != ["true", "false"].indexOf(String(value2).toLowerCase())) {
             return Boolean(value2);
           }
           if (isNull(parameter, value2)) {

package/dist/cjs/parameters.js

@@ -232,8 +232,8 @@ var ParameterEditors = [
       }
       function applyAriaSelected(selection) {
         var children = $list.find(".trv-listviewitem");
-        utils.each(children, function() {
-          var $item = $(this);
+        Array.from(children).forEach((item) => {
+          var $item = $(item);
           var isSelected = selection.filter($item).length > 0;
           $item.attr("aria-selected", isSelected);
         });
@@ -316,9 +316,9 @@ var ParameterEditors = [
           items = [items];
         }
         var children = $list.find(".trv-listviewitem");
-        utils.each(parameter.availableValues, function(i, av) {
+        $.each(parameter.availableValues, (i, av) => {
           var selected = false;
-          utils.each(items, function(j, v) {
+          $.each(items, (j, v) => {
             var availableValue = av.value;
             if (v instanceof Date) {
               availableValue = utils.parseToLocalDate(av.value);
@@ -357,8 +357,8 @@ var ParameterEditors = [
           addAccessibilityAttributes($list, stringResources.stringResources.ariaLabelMultiSelect, param.text, info, param.Error);
           $list.attr("aria-multiselectable", "true");
           var items = $list.find(".trv-listviewitem");
-          utils.each(items, function() {
-            $(this).attr("aria-label", this.innerText);
+          Array.from(items).forEach((item) => {
+            $(item).attr("aria-label", item.innerText);
           });
         },
         setAccessibilityErrorState: function(param) {
@@ -487,8 +487,8 @@ var ParameterEditors = [
           var info = utils.stringFormat(stringResources.stringResources.ariaLabelParameterInfo, [param.availableValues.length]);
           addAccessibilityAttributes($accessibilityDom, stringResources.stringResources.ariaLabelMultiSelect, param.text, info, param.Error);
           var items = editor.items();
-          utils.each(items, function() {
-            $(this).attr("aria-label", this.innerText);
+          Array.from(items).forEach((item) => {
+            $(item).attr("aria-label", item.innerText);
           });
         },
         setAccessibilityErrorState: function(param) {
@@ -550,7 +550,7 @@ var ParameterEditors = [
       }
       function setSelectedItems(value) {
         var items = $list.find(".trv-listviewitem");
-        utils.each(parameter.availableValues, function(i, av) {
+        $.each(parameter.availableValues, (i, av) => {
           var availableValue = av.value;
           if (value instanceof Date) {
             availableValue = utils.parseToLocalDate(av.value);
@@ -594,8 +594,8 @@ var ParameterEditors = [
           var info = utils.stringFormat(stringResources.stringResources.ariaLabelParameterInfo, [param.availableValues.length]);
           addAccessibilityAttributes($list, stringResources.stringResources.ariaLabelSingleValue, param.text, info, param.Error);
           var items = $list.find(".trv-listviewitem");
-          utils.each(items, function() {
-            $(this).attr("aria-label", this.innerText);
+          Array.from(items).forEach((item) => {
+            $(item).attr("aria-label", item.innerText);
           });
         },
         setAccessibilityErrorState: function(param) {
@@ -685,8 +685,8 @@ var ParameterEditors = [
           var info = utils.stringFormat(stringResources.stringResources.ariaLabelParameterInfo, [param.availableValues.length]);
           addAccessibilityAttributes($accessibilityDom, stringResources.stringResources.ariaLabelSingleValue, param.text, info, param.Error);
           var items = editor.items();
-          utils.each(items, function() {
-            $(this).attr("aria-label", this.innerText);
+          Array.from(items).forEach((item) => {
+            $(item).attr("aria-label", item.innerText);
           });
         },
         setAccessibilityErrorState: function(param) {

package/dist/cjs/parametersArea.js

@@ -160,12 +160,8 @@ function ParametersArea(placeholder, options, otherOptions) {
     }
   }
   function selectParameterEditorFactory(parameter, editorsType) {
-    var factory;
-    utils.each(parameterEditors, function() {
-      if (this && this.match(parameter, editorsType)) {
-        factory = this;
-      }
-      return !factory;
+    var factory = Array.from(parameterEditors).find((editor) => {
+      return editor.match(parameter, editorsType);
     });
     return factory;
   }
@@ -177,23 +173,21 @@ function ParametersArea(placeholder, options, otherOptions) {
     (allParametersAutoRefresh() ? $.fn.removeClass : $.fn.addClass).call($placeholder, "preview");
   }
   function allParametersAutoRefresh() {
-    var allAuto = true;
-    utils.each(parameters$1, function() {
-      return allAuto = !this.isVisible || this.autoRefresh;
+    var allAuto = Array.from(parameters$1).every((parameter) => {
+      return !parameter.isVisible || parameter.autoRefresh;
     });
     return allAuto;
   }
   function allParametersValid() {
-    var allValid = true;
-    utils.each(parameters$1, function() {
-      return allValid = !this.Error;
+    var allValid = Array.from(parameters$1).every((parameter) => {
+      return !parameter.Error;
     });
     return allValid;
   }
   function clearEditors() {
-    utils.each(editors, function() {
-      if (this.hasOwnProperty("destroy")) {
-        this.destroy();
+    Object.entries(editors).forEach(([key, editor]) => {
+      if (typeof editor.destroy === "function") {
+        editor.destroy();
       }
     });
     editors = {};
@@ -205,26 +199,26 @@ function ParametersArea(placeholder, options, otherOptions) {
     clearEditors();
     var $parameterContainer;
     var $tempContainer = $("<div></div>");
-    utils.each(parameters$1, function() {
+    Array.from(parameters$1).forEach((parameter) => {
       try {
-        this.value = parameterValidators.ParameterValidators.validate(this, this.value);
+        parameter.value = parameterValidators.ParameterValidators.validate(parameter, parameter.value);
       } catch (e) {
-        this.Error = this.Error || e;
+        parameter.Error = parameter.Error || e;
       }
-      var hasError = Boolean(this.Error);
+      var hasError = Boolean(parameter.Error);
       var hasValue = !hasError;
       if (hasValue) {
-        recentParameterValues[this.id] = this.value;
-        if (this.availableValues) {
-          processedParameterValues[this.id] = { valueMember: this.value, displayMember: this.label, availableValues: this.availableValues, multivalue: this.multivalue };
+        recentParameterValues[parameter.id] = parameter.value;
+        if (parameter.availableValues) {
+          processedParameterValues[parameter.id] = { valueMember: parameter.value, displayMember: parameter.label, availableValues: parameter.availableValues, multivalue: parameter.multivalue };
         } else {
-          processedParameterValues[this.id] = this.value;
+          processedParameterValues[parameter.id] = parameter.value;
         }
       } else {
-        this.Error = stringResources.stringResources.invalidParameter;
+        parameter.Error = stringResources.stringResources.invalidParameter;
       }
-      if (this.isVisible || options.showHiddenParameters) {
-        $parameterContainer = createParameterUI(this);
+      if (parameter.isVisible || options.showHiddenParameters) {
+        $parameterContainer = createParameterUI(parameter);
         if ($parameterContainer) {
           $tempContainer.append($parameterContainer);
         }
@@ -233,17 +227,17 @@ function ParametersArea(placeholder, options, otherOptions) {
     if (initialParameterValues !== void 0) {
       if (null === initialParameterValues) {
         initialParameterValues = {};
-        utils.each(parameters$1, function() {
-          if (this.isVisible) {
-            initialParameterValues[this.id] = this.value;
+        Array.from(parameters$1).forEach((parameter) => {
+          if (parameter.isVisible) {
+            initialParameterValues[parameter.id] = parameter.value;
           } else {
-            delete recentParameterValues[this.id];
+            delete recentParameterValues[parameter.id];
           }
         });
       } else {
-        utils.each(parameters$1, function() {
-          if (!(this.id in initialParameterValues)) {
-            delete recentParameterValues[this.id];
+        Array.from(parameters$1).forEach((parameter) => {
+          if (!(parameter.id in initialParameterValues)) {
+            delete recentParameterValues[parameter.id];
           }
         });
       }
@@ -286,7 +280,7 @@ function ParametersArea(placeholder, options, otherOptions) {
   }
   function invalidateChildParameters(parameter) {
     if (parameter.childParameters) {
-      utils.each(parameter.childParameters, function(index, parameterId) {
+      Array.from(parameter.childParameters).forEach((parameterId) => {
         var childParameter = getParameterById(parameterId);
         if (childParameter) {
           invalidateChildParameters(childParameter);
@@ -345,12 +339,10 @@ function ParametersArea(placeholder, options, otherOptions) {
     if (!params || null === params) {
       return false;
     }
-    var result = false;
-    utils.each(params, function() {
-      result = this.isVisible;
-      return !result;
+    var hasVisible = Array.from(params).some((parameter) => {
+      return parameter.isVisible;
     });
-    return result;
+    return hasVisible;
   }
   var loadingCount = 0;
   function beginLoad() {
@@ -490,13 +482,5 @@ function ParametersArea(placeholder, options, otherOptions) {
   );
   return parametersArea;
 }
-var pluginName = "telerik_ReportViewer_ParametersArea";
-$.fn[pluginName] = function(options, otherOptions) {
-  return utils.each(this, function() {
-    if (!$.data(this, pluginName)) {
-      $.data(this, pluginName, new ParametersArea(this, options, otherOptions));
-    }
-  });
-};
 
 exports.ParametersArea = ParametersArea;

package/dist/cjs/print.js

@@ -8,7 +8,7 @@ function IEHelper() {
   function getPdfPlugin() {
     var classIds = ["AcroPDF.PDF.1", "PDF.PdfCtrl.6", "PDF.PdfCtrl.5"];
     var plugin = null;
-    utils.each(classIds, function(index, classId) {
+    $.each(classIds, function(index, classId) {
       try {
         plugin = new ActiveXObject(classId);
         if (plugin) {
@@ -52,7 +52,7 @@ function ChromiumHelper(defaultPlugin) {
   function hasPdfPlugin2() {
     var navPlugins = navigator.plugins;
     var found = false;
-    utils.each(navPlugins, function(key, value) {
+    $.each(navPlugins, function(key, value) {
       if (navPlugins[key].name === defaultPlugin || navPlugins[key].name === "Adobe Acrobat") {
         found = true;
         return false;
@@ -86,8 +86,7 @@ function selectBrowserHelper() {
       return ChromiumHelper("Chrome PDF Viewer");
     else if (userAgent.indexOf("safari") > -1)
       return ChromiumHelper("WebKit built-in PDF");
-    else
-      return OtherBrowserHelper();
+    return OtherBrowserHelper();
   }
   return null;
 }

package/dist/cjs/reportViewer.js

@@ -25,6 +25,9 @@ var globalSettings = require('./globalSettings.js');
 var memStorage = require('./mem-storage.js');
 var templateCache = require('./template-cache.js');
 var reportViewerSettings = require('./report-viewer/report-viewer-settings.js');
+var linkButton = require('./toolbar/link-button.js');
+var pageNumberInput = require('./toolbar/page-number-input.js');
+var pageCountLabel = require('./toolbar/page-count-label.js');
 
 const Instances = globalSettings.GlobalSettings.viewerInstances;
 function getDefaultOptions(serviceUrl, version) {
@@ -85,8 +88,8 @@ function ReportViewer(dom, options) {
   if (!validateOptions(options)) {
     return;
   }
-  var version = "18.1.24.514";
-  options = utils.extend({}, getDefaultOptions(svcApiUrl, version), options);
+  var version = "18.1.24.709";
+  options = $.extend({}, getDefaultOptions(svcApiUrl, version), options);
   settings = new reportViewerSettings.ReportViewerSettings(
     persistanceKey,
     options.persistSession ? window.sessionStorage : new memStorage.MemStorage(),
@@ -537,24 +540,21 @@ function ReportViewer(dom, options) {
       return e.outerHTML;
     }).toArray();
     var promises = [];
-    utils.each(
-      styleSheets,
-      function(i, e) {
-        if (-1 === currentStyleLinks.indexOf(e)) {
-          promises.push(
-            new Promise(function(resolve, reject) {
-              var $link = $(e);
-              $link.on("load", resolve);
-              $link.on("onerror", function() {
-                utils.logError("error loading stylesheet " + e);
-                resolve();
-              });
-              $head.append($link);
-            })
-          );
-        }
+    Array.from(styleSheets).forEach((element) => {
+      if (currentStyleLinks.indexOf(element) === -1) {
+        promises.push(
+          new Promise(function(resolve, reject) {
+            var $link = $(element);
+            $link.on("load", resolve);
+            $link.on("onerror", function() {
+              utils.logError("error loading stylesheet " + element);
+              resolve();
+            });
+            $head.append($link);
+          })
+        );
       }
-    );
+    });
     return Promise.all(promises).then(controller$1.cssLoaded);
   }
   function browserSupportsAllFeatures() {
@@ -563,12 +563,11 @@ function ReportViewer(dom, options) {
   function ensureKendo(version2) {
     if (window.kendo) {
       return Promise.resolve();
-    } else {
-      var kendoUrl = utils.rTrim(svcApiUrl, "\\/") + "/resources/js/telerikReportViewer.kendo-" + version2 + ".min.js/";
-      return utils.loadScript(kendoUrl).catch(function(errorData) {
-        utils.logError("Kendo could not be loaded automatically. Make sure 'options.serviceUrl' / 'options.reportServer.url' is correct and accessible. The error is: " + errorData.error);
-      });
     }
+    var kendoUrl = utils.rTrim(svcApiUrl, "\\/") + "/resources/js/telerikReportViewer.kendo-" + version2 + ".min.js/";
+    return utils.loadScript(kendoUrl).catch(function(errorData) {
+      utils.logError("Kendo could not be loaded automatically. Make sure 'options.serviceUrl' / 'options.reportServer.url' is correct and accessible. The error is: " + errorData.error);
+    });
   }
   function main(version2) {
     ensureKendo(version2).then(function() {
@@ -596,7 +595,7 @@ function ReportViewer(dom, options) {
   if (browserSupportsAllFeatures()) {
     main(version);
   } else {
-    utils.loadScriptWithCallback("https://cdn.polyfill.io/v2/polyfill.min.js?features=Promise", main, version);
+    throw "The current browser does not support the Promise feature which is required for using the Report Viewer.";
   }
   return viewer;
 }
@@ -605,7 +604,7 @@ $.fn[pluginName] = function(options) {
   if (this.selector && !options.selector) {
     options.selector = this.selector;
   }
-  return utils.each(this, function() {
+  return this.each(function() {
     if (!$.data(this, pluginName)) {
       $.data(this, pluginName, new ReportViewer(this, options));
     }
@@ -639,11 +638,23 @@ const plugins = [
   {
     name: "telerik_ReportViewer_SideMenu",
     constructor: sideMenu.SideMenu
+  },
+  {
+    name: "telerik_ReportViewer_LinkButton",
+    constructor: linkButton.LinkButton
+  },
+  {
+    name: "telerik_ReportViewer_PageNumberInput",
+    constructor: pageNumberInput.PageNumberInput
+  },
+  {
+    name: "telerik_ReportViewer_PageCountLabel",
+    constructor: pageCountLabel.PageCountLabel
   }
 ];
 plugins.forEach((plugin) => {
   $.fn[plugin.name] = function(options, otherOptions) {
-    return utils.each(this, function() {
+    return this.each(function() {
       if (!$.data(this, plugin.name)) {
         $.data(this, plugin.name, new plugin.constructor(this, options, otherOptions));
       }

package/dist/cjs/scroll.js

@@ -282,11 +282,11 @@ var Scroll = {
   _loadVisiblePages: function _loadVisiblePages() {
     var that = this;
     var pages = that.$placeholder.find(".trv-report-page");
-    $.each(pages, function(index, value) {
+    Array.from(pages).forEach((value) => {
       var pageItem = $(value);
       var pageNumber = parseInt(pageItem.attr("data-page"));
       if (that._scrolledInToView(pageItem) && that._isSkeletonScreen(pageItem, pageNumber)) {
-        that.controller.getPageData(pageNumber).then(function(newPage) {
+        that.controller.getPageData(pageNumber).then((newPage) => {
           that._render(newPage, false);
         });
       }
@@ -457,9 +457,8 @@ var Scroll = {
       return that._findNewCurrentPage(pages.splice(middleIndex, Number.MAX_VALUE));
     } else if (result > 0 && pages.length > 1) {
       return that._findNewCurrentPage(pages.splice(0, middleIndex));
-    } else {
-      return -1;
     }
+    return -1;
   },
   _findPageInViewPort: function _findPageInViewPort(index, pages) {
     var pageItem = this.$placeholder.find(pages[index]);
@@ -476,9 +475,8 @@ var Scroll = {
     }
     if (pageBottom < additionalTopOffset) {
       return -1;
-    } else {
-      return 1;
     }
+    return 1;
   },
   _scrollDown: function _scrollDown(pages, scrollPosition) {
     var that = this;