diff --git a/petitnote/app/neo/neo.css b/petitnote/app/neo/neo.css index 830aa156..b24d303b 100644 --- a/petitnote/app/neo/neo.css +++ b/petitnote/app/neo/neo.css @@ -28,6 +28,8 @@ position: relative; height: 100%; margin: auto; + min-width: 397px; + /* 300px相当の最低幅 */ } .NEO #toolsWrapper { diff --git a/petitnote/app/neo/neo.js b/petitnote/app/neo/neo.js index 90c6f7f8..0f2023b1 100644 --- a/petitnote/app/neo/neo.js +++ b/petitnote/app/neo/neo.js @@ -1261,6 +1261,15 @@ Neo.submit = function (board, blob, thumbnail, thumbnail2) { Neo.submitButton.enable(); return alert(text.replace(/^error\n/m, "")); } + if (text !== "ok") { + Neo.submitButton.enable(); + return alert( + errorMessage + + Neo.translate( + "投稿に失敗。時間を置いて再度投稿してみてください。" + ) + ); + } var exitURL = Neo.getAbsoluteURL(board, Neo.config.url_exit); var responseURL = text.replace(/&/g, "&"); @@ -1318,6 +1327,7 @@ Neo.submit = function (board, blob, thumbnail, thumbnail2) { ); if (!isConfirmed) { + Neo.submitButton.enable(); console.log("中止しました。"); return; // ユーザーが続行しない場合、処理を中断 } @@ -4931,7 +4941,7 @@ Neo.DrawToolBase.prototype.freeHandUpMoveHandler = function (oe) { }; Neo.DrawToolBase.prototype.drawCursor = function (oe) { - // if (oe.lineWidth <= 8) return; + // if (oe.lineWidth <= 8) return; var mx = oe.mouseX; var my = oe.mouseY; var d = oe.lineWidth; diff --git a/petitnote/index.php b/petitnote/index.php index 7bc0677f..915b4fd1 100644 --- a/petitnote/index.php +++ b/petitnote/index.php @@ -1,8 +1,8 @@ true]); list($picw,$pich) = getimagesize($pchup); $imgfile = $pchup; - $anime = false; }else{ safe_unlink($pchup); return error($en? 'This file is an unsupported format.':'対応していないファイル形式です。'); @@ -844,7 +842,6 @@ function paint(){ } $imgfile = IMG_DIR.$imgfile; - $anime= true;//常にtrue if($ctype=='img'){//画像から続き if($_pch_ext==='.chi'){ @@ -926,6 +923,7 @@ function paint(){ case 'neo'://PaintBBS NEO $tool='neo'; + $anime= true;//常にtrue $appw = $picw + 150;//NEOの幅 $apph = $pich + 172;//NEOの高さ $appw = max($appw,450);//最低幅 diff --git a/petitnote/template/basic/continue.html b/petitnote/template/basic/continue.html index 33f6076b..24dfa850 100644 --- a/petitnote/template/basic/continue.html +++ b/petitnote/template/basic/continue.html @@ -154,18 +154,21 @@