TheDesk Miho (ver.4[fixed])

app/index.html

@@ -23,7 +23,7 @@
 <script type="text/javascript" src="./js/common/keyshortcut.js"></script>
 <script type="text/javascript" src="./js/common/modal.js"></script>
 <script>
-var ver="Miho (ver.4)";
+var ver="Miho (ver.4[fixed])";
 //betaを入れるとバージョンチェックしない
 //var ver="beta";
 var acct_id=0;
@@ -248,30 +248,6 @@ var tlid=0;
     <div class="modal-footer">
 		<a href="#!" class="modal-action modal-close waves-effect waves-green btn-flat">Close</a>
     </div>
-  </div>
-      <!-- Modal Structure Image-->
-  <div id="imagemodal" class="modal modal-fixed-footer" style="margin-top:-10%">
-    <div class="modal-content">
-		<div id="imagewrap">
-		<img src="" id="imgmodal">
-	</div><br>
-	</div>
-    <div class="modal-footer">
-		<a href="#!" class="modal-action modal-close waves-effect waves-green btn-flat">Close</a>
-	<button class="btn waves-effect orange" onclick="imgCont('prev')" id="image-prev">←</button>
-	<button class="btn waves-effect" onclick="zoom(2)">2x</button>
-	<button class="btn waves-effect" onclick="zoom(0.5)">0.5x</button>
-	<button class="btn waves-effect orange" onclick="imgCont('next')" id="image-next">→</button>
-    </div>
-  </div>
-    <!-- Modal Structure Video-->
-  <div id="videomodal" class="modal modal-fixed-footer">
-    <div class="modal-content">
-		<video src="" id="video" style="width:100%;" controls >
-	</div>
-    <div class="modal-footer">
-		<a href="#!" class="modal-action modal-close waves-effect waves-green btn-flat">Close</a>
-    </div>
   </div>
   <!-- Modal Structure Userdata -->
   <div id="his-data" class="modal bottom-sheet modal-fixed-footer" style="max-height:750px; height:90%;">
@@ -345,6 +321,30 @@ var tlid=0;
 	<a href="#!" class="modal-action waves-effect waves-green btn-flat" id="his-block-btn" onclick="block()">ブロック</a>
       <a href="#!" class="modal-action waves-effect waves-green btn-flat" onclick="hisclose()">Close</a>
     </div>
+  </div>
+       <!-- Modal Structure Image-->
+  <div id="imagemodal" class="modal modal-fixed-footer" style="margin-top:-10%">
+    <div class="modal-content">
+		<div id="imagewrap">
+		<img src="" id="imgmodal">
+	</div><br>
+	</div>
+    <div class="modal-footer">
+		<a href="#!" class="modal-action modal-close waves-effect waves-green btn-flat">Close</a>
+	<button class="btn waves-effect orange" onclick="imgCont('prev')" id="image-prev">←</button>
+	<button class="btn waves-effect" onclick="zoom(2)">2x</button>
+	<button class="btn waves-effect" onclick="zoom(0.5)">0.5x</button>
+	<button class="btn waves-effect orange" onclick="imgCont('next')" id="image-next">→</button>
+    </div>
+  </div>
+    <!-- Modal Structure Video-->
+  <div id="videomodal" class="modal modal-fixed-footer">
+    <div class="modal-content">
+		<video src="" id="video" style="width:100%;" controls >
+	</div>
+    <div class="modal-footer">
+		<a href="#!" class="modal-action modal-close waves-effect waves-green btn-flat">Close</a>
+    </div>
   </div>
   <!--左下メッセージ-->
 <div id="message"></div>

app/js/ui/img.js

@@ -25,9 +25,13 @@ function imgv(id, key) {
 		}
 		if ($("#" + id + "-image-" + (key * 1 + 1)).length == 0) {
 			$("#image-next").prop("disabled", true);
+		} else {
+			$("#image-next").prop("disabled", false);
 		}
 		if ($("#" + id + "-image-" + (key * 1 - 1)).length == 0) {
 			$("#image-prev").prop("disabled", true);
+		} else {
+			$("#image-prev").prop("disabled", false);
 		}
 		element.src = murl;
 	});
@@ -42,8 +46,9 @@ function imgCont(type) {
 	} else if (type == "prev") {
 		key = key * 1 - 1;
 	}
-	$('#imgmodal').attr('src', './img/loading.svg');
 	var murl = $("#" + id + "-image-" + key).attr("data-url");
+	if(murl){
+	$('#imgmodal').attr('src', './img/loading.svg');
 	var type = $("#" + id + "-image-" + key).attr("data-type");
 	$(document).ready(function() {
 		if (type == "image") {
@@ -75,7 +80,9 @@ function imgCont(type) {
 			$("#image-prev").prop("disabled", false);
 		}
 		element.src = murl;
+		
 	});
+	}
 }
 //ズームボタン(z:倍率)
 function zoom(z) {

app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "TheDesk",
-  "version": "11.4.0",
+  "version": "11.4.1",
   "description": "TheDesk on Mastodonはシンプルと多機能を両立したデスクトップ向けクライアントです",
   "main": "main.js",
   "scripts": {