Ver Fonte

fix ios blobLoad function

Avetisyan Karen há 7 anos atrás
pai
commit
a58e423c37

+ 1 - 1
web_interface/src/wui/history.html

@@ -50,7 +50,7 @@
     <button class="btn btn-default" onclick="nextPage();"><span aria-hidden="true">&rarr;</span></button>
     <button class="btn btn-default" onclick="getPage(parseInt($('pagelimit').textContent));"><span aria-hidden="true">&raquo;|</span></button>
   </div>
-  <button class="btn btn-primary-inverted" id="dload_history" onclick="blobLoad('history.cgi?page=all', 'history.csv', this.id);">
+  <button class="btn btn-primary-inverted" id="dload_history" onclick="return blobLoad('history.cgi?page=all', 'history.csv', this.id);">
     <span id="bl_text">Сохранить в CSV</span>
     <div id="bl_fill"></div>
   </button>

+ 1 - 0
web_interface/src/wui/main.js

@@ -701,6 +701,7 @@ function msieversion() {
 function blobLoad(requestUrl, fileName, buttonID){
   if(isMobile.iOS()){
     alert('На данном устройстве сохранение не доступно.');
+    return false;
   }
 
   var old = $(buttonID).children[0].textContent;

+ 1 - 1
web_interface/src/wui/ups_history.html

@@ -56,7 +56,7 @@
     <button class="btn btn-default" onclick="nextUPSPage();"><span aria-hidden="true">&rarr;</span></button>
     <button class="btn btn-default" onclick="getUPSPage(parseInt($('pagelimit').textContent));"><span aria-hidden="true">&raquo;|</span></button>
   </div>
-  <button class="btn btn-primary-inverted" id="dload_history" onclick="blobLoad('ups_history.cgi?page=all', 'ups_history.csv', this.id);">
+  <button class="btn btn-primary-inverted" id="dload_history" onclick="return blobLoad('ups_history.cgi?page=all', 'ups_history.csv', this.id);">
     <span id="bl_text">Сохранить в CSV</span>
     <div id="bl_fill"></div>
   </button>