From 0bdb46a67a327dce201a5d8a1c93c3c11ecdcec4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8F=99=E8=BF=B0=E3=80=81=E5=88=AB=E7=A6=BB?= <2449271624@qq.com> Date: Tue, 19 Sep 2023 11:34:57 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=84=9A=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/admin/dialog/select_mimages.php | 2 +- src/admin/js/album.js | 32 ----------- src/admin/js/main.js | 85 ++++------------------------- 3 files changed, 12 insertions(+), 107 deletions(-) diff --git a/src/admin/dialog/select_mimages.php b/src/admin/dialog/select_mimages.php index 8a4af581..1f1c1de1 100644 --- a/src/admin/dialog/select_mimages.php +++ b/src/admin/dialog/select_mimages.php @@ -20,7 +20,7 @@ include(DEDEDATA.'/mark/inc_photowatermark_config.php');
- + diff --git a/src/admin/js/album.js b/src/admin/js/album.js index 468b3ee6..ddbc188b 100644 --- a/src/admin/js/album.js +++ b/src/admin/js/album.js @@ -36,38 +36,6 @@ function delAlbPicOld(picfile, pid) { $Obj("galleryedit").removeChild(tgobj); }); } -function seePicNewAlb(f, imgdid, frname, hpos, acname) { - var newobj = null; - if (f.value == '') return; - vImg = $Obj(imgdid); - picnameObj = document.getElementById("picname"); - nFrame = $Nav() == $Obj(frname); - nForm = f.form; - if (nForm.detachEvent) nForm.detachEvent("onsubmit", checkSubmitAlb); - else nForm.removeEventListener("submit", checkSubmitAlb, false); - nForm.action = "archives_do.php"; - nForm.target = frname; - nForm.dopost.value = "uploadLitpic"; - nForm.submit(); - picnameObj.value = ''; - newobj = $Obj("uploadwait"); - if (!newobj) { - newobj = document.createElement("div"); - newobj.id = "uploadwait"; - newobj.style.position = "absolute"; - newobj.className = "uploadwait"; - newobj.style.width = 120; - newobj.style.height = 20; - newobj.style.top = hpos; - newobj.style.left = 100; - document.body.appendChild(newobj); - } - newobj.style.display = "block"; - nForm.action = acname; - nForm.dopost.value = "save"; - nForm.target = ''; - nForm.litpic.disabled = true; -} var atlasimg = 0; function addImage(src, pid) { var newImgDiv = document.createElement("div"); diff --git a/src/admin/js/main.js b/src/admin/js/main.js index 651ebd55..ea7089a2 100644 --- a/src/admin/js/main.js +++ b/src/admin/js/main.js @@ -1,7 +1,3 @@ -var nForm = null; -var nFrame = null; -var picnameObj = null; -var vImg = null; function GetWinPos(w, h) { var dualScreenLeft = window.screenLeft !== undefined ? window.screenLeft : window.screenX; var dualScreenTop = window.screenTop !== undefined ? window.screenTop : window.screenY; @@ -12,39 +8,6 @@ function GetWinPos(w, h) { var top = (height - h) / 2 / systemZoom + dualScreenTop; return { left: left, top: top }; } -function SeePicNew(f, imgdid, frname, hpos, acname) { - var newobj = null; - if (f.value == '') return; - vImg = $Obj(imgdid); - picnameObj = document.getElementById('picname'); - nFrame = $Nav() == $Obj(frname); - nForm = f.form; - if (nForm.detachEvent) nForm.detachEvent("onsubmit", checkSubmit); - else nForm.removeEventListener("submit", checkSubmit, false); - nForm.action = "archives_do.php"; - nForm.target = frname; - nForm.dopost.value = "uploadLitpic"; - nForm.submit(); - picnameObj.value = ''; - newobj = $Obj("uploadwait"); - if (!newobj) { - newobj = document.createElement("div"); - newobj.id = "uploadwait"; - newobj.style.position = "absolute"; - newobj.className = "uploadwait"; - newobj.style.width = 120; - newobj.style.height = 20; - newobj.style.top = hpos; - newobj.style.left = 100; - newobj.style.display = "block"; - document.body.appendChild(newobj); - } - newobj.style.display = "block"; - nForm.action = acname; - nForm.dopost.value = "save"; - nForm.target = ''; - nForm.litpic.disabled = true; -} function SelectMedia(fname) { var pos = GetWinPos(800,600); window.open("./dialog/select_media.php?f=" + fname + "&noeditor=yes", "popUpFlashWin", "scrollbars=yes,resizable=yes,statebar=no,width=800,height=600,left=" + pos.left + ", top=" + pos.top); @@ -74,6 +37,9 @@ function OpenMyWin(surl) { var pos = GetWinPos(800,600); window.open(surl, "popUpMyWin", "scrollbars=yes,resizable=yes,statebar=no,width=800,height=600,left=" + pos.left + ", top=" + pos.top); } +function $Obj(objname) { + return document.getElementById(objname); +} function InitPage() { var selsource = $Obj("selsource"); var selwriter = $Obj("selwriter"); @@ -89,13 +55,6 @@ function InitPage() { } } } -function $Nav() { - if (window.navigator.userAgent.indexOf("Firefox") >= 1) return "FF"; - else return "OT"; -} -function $Obj(objname) { - return document.getElementById(objname); -} function ColorSel(c, oname) { var tobj = $Obj(oname); if (!tobj) tobj = eval("document.form1." + oname); @@ -133,9 +92,6 @@ function HideObj(objname) { if (obj == null) return false; obj.style.display = "none"; } -function SeePic(img, f) { - if (f.value != '') img.src = f.value; -} function PutSource(str) { var osource = $Obj("source"); if (osource) osource.value = str; @@ -179,14 +135,16 @@ function SelectWriter(e) { } function LoadNewDiv(e, surl, oname) { var pxStr = ''; - posLeft = posLeft - 100; + var posLeft = e.pageX - 20; + var posTop = e.pageY - 30; + pxStr = 'px'; var newobj = $Obj(oname); if (!newobj) { newobj = document.createElement("div"); newobj.id = oname; - newobj.style.position = "absolute"; + newobj.style.position = 'absolute'; newobj.className = oname; - newobj.className += " dlgws"; + newobj.className += ' dlgws'; newobj.style.top = posTop + pxStr; newobj.style.left = posLeft + pxStr; document.body.appendChild(newobj); @@ -194,31 +152,10 @@ function LoadNewDiv(e, surl, oname) { newobj.style.display = "block"; } if (newobj.innerHTML.length < 10) { - fetch(surl).then(resp => resp.text()).then((d) => { newobj.innerHTML = d }); - } -} -function LoadNewDiv2(e, surl, oname, dlgcls) { - var posLeft = 300; - var posTop = 50; - var newobj = $Obj(oname); - if (!newobj) { - newobj = document.createElement("div"); - newobj.id = oname; - newobj.style.position = "absolute"; - newobj.className = dlgcls; - newobj.style.top = posTop; - newobj.style.left = posLeft; - newobj.style.display = "none"; - document.body.appendChild(newobj); + fetch(surl).then(resp => resp.text()).then((d) => { + newobj.innerHTML = d; + }); } - newobj.innerHTML = ''; - fetch(surl).then(resp => resp.text()).then((d) => { - newobj.innerHTML = d; - }); - if (newobj.innerHTML == '') newobj.style.display = "none"; - else newobj.style.display = "block"; - jQuery(newobj).css("top", "50px").css("left", "300px"); - DedeXHTTP = null; } function ShowUrlTr() { var jumpTest = $Obj("flagsj");