merge

app/js/ui/img.js

@@ -22,20 +22,40 @@ function imgv(id, key, acct_id) {
 		murl = ourl
 	}
 	$(document).ready(function () {
-		if (type == 'image') {
-			$('#imagemodal').modal('open')
-			imageXhr(id, key, murl)
-			$('#imagewrap').dragScroll() // ドラッグスクロール設定
-			$('#imgmodal').show()
-			$('#imagemodal').attr('data-key', key)
-			$('#imagemodal').attr('data-id', id)
-		} else if (type == 'video' || type == 'gifv') {
-			$('#video').attr('src', murl)
-			$('#videomodal').modal('open')
-			$('#imgmodal').show()
+		if (type == 'image') {display_image(murl,id,key)}
+		else if (type == 'video') {display_video(murl)}
+		else if (type == 'gifv')
+		{
+			if (remote_img == 'no') {display_video(murl)}
+			else
+			{
+				// Need to detect if it's a video or a gif, depends if it came from pleroma or mastodon
+				// Using extension is a bad idea but w/e
+				// Actually if it's from mastodon the extension will be mp4.
+				if (murl.endsWith('.mp4')) {display_video(murl)}
+				else {display_image(murl,id,key)}
+			}
 		}
 	})
 }
+
+function display_image(murl,id,key)
+{
+	$('#imagemodal').modal('open')
+	imageXhr(id, key, murl)
+	$('#imagewrap').dragScroll() // ドラッグスクロール設定
+	$('#imgmodal').show()
+	$('#imagemodal').attr('data-key', key)
+	$('#imagemodal').attr('data-id', id)
+}
+
+function display_video(murl,id=null,key=null)
+{
+	$('#video').attr('src', murl)
+	$('#videomodal').modal('open')
+	$('#imgmodal').show()
+}
+
 //イメージビューワーの送り
 function imgCont(type) {
 	var key = $('#imagemodal').attr('data-key')
@@ -47,6 +67,9 @@ function imgCont(type) {
 	}
 	var murl = $('#' + id + '-image-' + key).attr('data-url')
 	var ourl = $('#' + id + '-image-' + key).attr('data-original')
+	if (!ourl || ourl == 'null') {
+		ourl = murl
+	}
 	var type = $('#' + id + '-image-' + key).attr('data-type')
 	$('#imagemodal').attr('data-id', id)
 	$('#imagemodal').attr('data-acct', acct_id)
@@ -54,7 +77,7 @@ function imgCont(type) {
 	$('#imagemodal').attr('data-image', murl)
 	//表示はリモートを使うか(どちらにしろコピーはオリジナル)
 	var remote_img = localStorage.getItem('remote_img')
-	if (remote_img == 'yes' && ourl != 'null') {
+	if (remote_img == 'yes') {
 		murl = ourl
 	}
 	if (murl) {
@@ -336,7 +359,10 @@ function openFinder(dir) {
 	postMessage(['openFinder', dir], '*')
 }
 function stopVideo() {
-	document.getElementById('video').pause()
+	video=document.getElementById('video')
+	video.pause()
+	video.src=''
+	//document.getElementById('video').pause()
 }
 function copyImgUrl() {
 	var murl = $('#imagemodal').attr('data-original')