Fix: pagination is not working on Edge browser #10

DICOMcloud · Jan 5, 2018 · bfcb2f4 · bfcb2f4
1 parent 20df3c4
commit bfcb2f4
Show file tree

Hide file tree

Showing 6 changed files with 1,535 additions and 1,505 deletions.
diff --git a/Demo/JSLib/Query/QueryController.ts b/Demo/JSLib/Query/QueryController.ts
@@ -238,8 +238,15 @@
 
             try {
                var totalCount = xhr.getResponseHeader("X-Total-Count");
-               if (totalCount) {
-                  this._studyPagerModel.setLinkHeader(xhr.getResponseHeader("link"), data.length, parseInt(totalCount, 10));
+               var linkHeader = xhr.getResponseHeader("link");
+
+               if (linkHeader) {
+                  if (!totalCount)
+                  {
+                     totalCount = "-1";                       
+                  }
+
+                  this._studyPagerModel.setLinkHeader(linkHeader, data.length, parseInt(totalCount, 10));
                   this._studyPagerModel.currentOffset = offset;
                   this._studyPagerView.render();
                   this._studyPagerView.show();

diff --git a/Demo/JSLib/Query/QueryPagerView.js.map b/Demo/JSLib/Query/QueryPagerView.js.map
diff --git a/Demo/JSLib/Query/QueryPagerView.ts b/Demo/JSLib/Query/QueryPagerView.ts
@@ -66,13 +66,20 @@ class QueryPagerView
          this._$last.removeClass("disabled");
       }
 
-      this._$pageInfo.text("Page: " + this.model.currentPage + "/" + this.model.pageCount);
+      if (this.model.pageCount >= this.model.currentPage) {
+         this._$pageInfo.text("Page: " + this.model.currentPage + "/" + this.model.pageCount);
+      }
+      else
+      {
+         this._$pageInfo.text("Page: " + this.model.currentPage);
+      }
    }
 
    public show()
    {
       this._$element.show();
    }
+
    public hide() {
       this._$element.hide();
    }

diff --git a/Demo/Views/Demo/_AlertDlg.cshtml b/Demo/Views/Demo/_AlertDlg.cshtml
@@ -7,7 +7,7 @@
                 <h4 class="modal-title" id="modal-sample-label"></h4>
             </div>
             <div class="model-body" >
-                <div class="model-body-content" style="height:300px"/>
+                <div class="model-body-content" style="height:300px"></div>
             </div>
             <div class="modal-footer">
                 <button type="button" class="btn btn-info"