diff --git a/plugins/screen_control.js b/plugins/screen_control.js index 67606b0..ff238bc 100755 --- a/plugins/screen_control.js +++ b/plugins/screen_control.js @@ -1,7 +1,8 @@ let tue_screen_control=true; tuesday.addEventListener('mouseup',function(e){ - if(tue_screen_control && e.pageX > tuesday.offsetWidth/3 ){if(story_json[tue_story][scene].dialogs==0 || check_choice(story_json[tue_story][scene].dialogs)){go_story()}} - else if( story_json[tue_story][scene].dialogs==0 || check_choice(story_json[tue_story][scene].dialogs) && tue_screen_control){back_story()}; + // if(tue_screen_control && e.pageX > tuesday.offsetWidth/3 ){ + if(story_json[tue_story][scene].dialogs==0 || check_choice(story_json[tue_story][scene].dialogs)){go_story()} + // } else if( story_json[tue_story][scene].dialogs==0 || check_choice(story_json[tue_story][scene].dialogs) && tue_screen_control){back_story()}; tue_screen_control=true; }); tuesday.addEventListener('script_loaded',function(event){ diff --git a/tools/JS_survival_guide.html b/tools/JS_survival_guide.html deleted file mode 100644 index 935dbc4..0000000 --- a/tools/JS_survival_guide.html +++ /dev/null @@ -1,225 +0,0 @@ -
\ No newline at end of file diff --git a/tools/replace.html b/tools/replace.html index 335c548..5542825 100755 --- a/tools/replace.html +++ b/tools/replace.html @@ -225,7 +225,7 @@ t=t.replace("Suki Novels","Suki Novels") t=t.replace("","") t=t.replace("https://www.patreon.com/kirill_live","https://boosty.to/kirilllive") - let s="", + let s="", r=""; t=t.replace(s,r) diff --git a/translate/en_tuesday_visual.html b/translate/en_tuesday_visual.html index 9841310..57dc93a 100644 --- a/translate/en_tuesday_visual.html +++ b/translate/en_tuesday_visual.html @@ -453,6 +453,7 @@ outline:none; resize:none; padding:8px; + tab-size:4; margin:0; } .code_text{ @@ -871,7 +872,7 @@ },"screen_control":{ "name":"Screen control", "text":"switches dialogue by click to screen.", - "code":"let tue_screen_control=!0;tuesday.addEventListener(\"mouseup\",function(e){tue_screen_control&&e.pageX>tuesday.offsetWidth/3?(0==story_json[tue_story][scene].dialogs||check_choice(story_json[tue_story][scene].dialogs))&&go_story():(0==story_json[tue_story][scene].dialogs||check_choice(story_json[tue_story][scene].dialogs)&&tue_screen_control)&&back_story(),tue_screen_control=!0}),tuesday.addEventListener(\"script_loaded\",function(e){document.getElementById(\"tue_back\")&&(tue_back.style.pointerEvents=\"none\"),document.getElementById(\"tue_next\")&&(tue_next.style.pointerEvents=\"none\");for(var t=document.getElementById(\"tuesday\").getElementsByClassName(\"tue_controll\"),n=0;nreading text with a synthesized voice", @@ -947,13 +948,13 @@ modal_window("open",sel); }else{editor_setup();} function editor_setup(){ - world.className=setup_editor.fon; + + world.className=setup_editor.fon; screen_preview.className=setup_editor.fon; - //preview_size(true); if(setup_editor.wheel){html.style.overflow='hidden';} if(setup_editor.ui&&setup_editor.ui!=0){set_ui(setup_editor.ui);} if(!setup_editor.pvw){setup_editor.pvw=[640,480];} - else{html.style.overflow='auto';} + else{html.style.overflow=(navigator.userAgent.indexOf('Firefox')>0)?'hidden':'auto';} if(setup_editor.lines_anim){document.querySelector(':root').style.setProperty('--ls','20');}else{document.querySelector(':root').style.setProperty('--ls','0');} document.getElementById('screen_size').getElementsByTagName('option')[1].value=(setup_editor.pvw[0]>=setup_editor.pvw[1])?setup_editor.pvw[0]:setup_editor.pvw[1] } @@ -1367,6 +1368,7 @@ function movie_dlock(id){ var focus_block=document.getElementById(id); focus_block.onmousedown=function(e){ + if(e.button==1){e.preventDefault();} story_blocks.appendChild(focus_block); menu_add.style.visibility="hidden"; var coords=getCoords(focus_block); @@ -1443,7 +1445,7 @@ var startmove_x=null,startmove_y=null,scroll_x=null,scroll_y=null,scroll_xz=null,scroll_yz=null,dictat_m=0,dictat_s=0; html.ontouchstart=function(e){ if(!scroll_block||(scene_screen&&!scene_scroll)){ - html.style.overflow='scroll'; + html.style.overflow=(navigator.userAgent.indexOf('Firefox')>0)?'hidden':'scroll'; if(e.touches.length>1){dictat_s=Math.sqrt((e.touches[0].clientX-e.touches[1].clientX)**2+(e.touches[0].clientY-e.touches[1].clientY)**2)} html.ontouchmove=function(e){ if(e.touches.length>1&&!scene_screen){ @@ -1457,7 +1459,7 @@ startmove_y=null; html.ontouchmove=null; html.ontouchend=null; - scene_view.style.overflow="auto"; + scene_view.style.overflow=(navigator.userAgent.indexOf('Firefox')>0)?'hidden':'auto'; scale=Math.min(2,Math.max(0.25,(scale+dictat_m)));dictat_m=0; scroll_z(); }; @@ -1478,13 +1480,14 @@ startmove_y=null; scene_view.ontouchmove=null; scene_view.ontouchend=null; - scene_view.style.overflow="auto"; + scene_view.style.overflow=(navigator.userAgent.indexOf('Firefox')>0)?'hidden':'auto'; scale_scene=Math.min(2,Math.max(0.25,(scale_scene+dictat_m)));dictat_m=0; scroll_z(); }; } } world.onmousedown=function(e){ + if(e.button==1){e.preventDefault();} if(!scroll_block&&!scene_screen){ startmove_x=e.clientX; startmove_y=e.clientY; @@ -1510,6 +1513,7 @@ } } scene_view.onmousedown=function(e){ + if(e.button==1){e.preventDefault();} if(scene_screen&&scene_scroll){ startmove_x=e.clientX; startmove_y=e.clientY; @@ -1544,7 +1548,7 @@ menu_add.style.visibility="hidden"; window_zone.style.visibility="hidden" window_zone.style.backgroundColor='rgba(110,95,165,0)'; - if(!scene_screen){html.style.overflow='scroll';scroll_block=false;} + if(!scene_screen){html.style.overflow=(navigator.userAgent.indexOf('Firefox')>0)?'hidden':'scroll';;scroll_block=false;} window_zone.innerHTML=""; }else if(action=='open'&&window_zone.style.visibility!="visible"){ window_zone.style.visibility="visible"; @@ -1662,7 +1666,7 @@ +"" +"
" - +"

Create project
" + +"

Create project
" modal_window("open",html); } function build(tip){ @@ -2671,7 +2675,7 @@ }else{ tool_update=false; tools_zone.style.visibility="hidden"; - html.style.overflow='scroll'; + html.style.overflow=(navigator.userAgent.indexOf('Firefox')>0)?'hidden':'scroll';; menu_panel.style.zIndex=null; tools_zone.innerHTML=""; scroll_block=false;scene_screen=false; @@ -2690,6 +2694,7 @@ } function adden_scroll(id,z){ id.onmousedown=function(e){ + if(e.button==1){e.preventDefault();} if(scene_scroll){ startmove_x=e.clientX; startmove_y=e.clientY; @@ -2727,7 +2732,7 @@ startmove_y=null; this.ontouchmove=null; this.ontouchend=null; - scene_view.style.overflow="auto"; + scene_view.style.overflow=(navigator.userAgent.indexOf('Firefox')>0)?'hidden':'auto'; tool_scale=Math.min(2,Math.max(0.25,(tool_scale+dictat_m)));dictat_m=0; }; }} @@ -3435,7 +3440,8 @@ scene_layout.style.backgroundSize=((!story_script[block][i].background_size)?"cover":story_script[block][i].background_size); scene_layout.style.backgroundPosition=((!story_script[block][i].background_align)?"center":story_script[block][i].background_align); scene_layout.style.backgroundColor=story_script[block][i].background_color; - if(!scene_screen){ + scene_view.style.overflow=(navigator.userAgent.indexOf('Firefox')>0)?'hidden':'auto'; + if(!scene_screen){ scene_view.scrollTop=(screen_preview.clientHeight/2)-(scene_view.clientHeight/2); scene_view.scrollLeft=(screen_preview.clientWidth/2)-(scene_view.clientWidth/2); } @@ -5183,6 +5189,7 @@ else if(e.keyCode == '39'){if(objFocus){scene_view.style.overflow='scroll'}} } s.onmousedown=function(e){ + if(e.button==1){e.preventDefault();} if(moveSize){ e=e||window.event; e.preventDefault(); @@ -5628,7 +5635,7 @@ if(tools_zone.style.visibility=="visible"){ tool_update=false; tools_zone.style.visibility="hidden"; - html.style.overflow='scroll'; + html.style.overflow=(navigator.userAgent.indexOf('Firefox')>0)?'hidden':'scroll';; menu_panel.style.zIndex=null; tools_zone.innerHTML=""; scroll_block=false;scene_screen=false; diff --git a/translate/es_tuesday_visual.html b/translate/es_tuesday_visual.html index 677fc27..0cba3d2 100644 --- a/translate/es_tuesday_visual.html +++ b/translate/es_tuesday_visual.html @@ -453,6 +453,7 @@ outline:none; resize:none; padding:8px; + tab-size:4; margin:0; } .code_text{ @@ -871,7 +872,7 @@ },"screen_control":{ "name":"control de pantalla", "text":"cambia el diálogo haciendo clic en la pantalla.", - "code":"let tue_screen_control=!0;tuesday.addEventListener(\"mouseup\",function(e){tue_screen_control&&e.pageX>tuesday.offsetWidth/3?(0==story_json[tue_story][scene].dialogs||check_choice(story_json[tue_story][scene].dialogs))&&go_story():(0==story_json[tue_story][scene].dialogs||check_choice(story_json[tue_story][scene].dialogs)&&tue_screen_control)&&back_story(),tue_screen_control=!0}),tuesday.addEventListener(\"script_loaded\",function(e){document.getElementById(\"tue_back\")&&(tue_back.style.pointerEvents=\"none\"),document.getElementById(\"tue_next\")&&(tue_next.style.pointerEvents=\"none\");for(var t=document.getElementById(\"tuesday\").getElementsByClassName(\"tue_controll\"),n=0;nreading text with a synthesized voice", @@ -947,13 +948,13 @@ modal_window("open",sel); }else{editor_setup();} function editor_setup(){ - world.className=setup_editor.fon; + + world.className=setup_editor.fon; screen_preview.className=setup_editor.fon; - //preview_size(true); if(setup_editor.wheel){html.style.overflow='hidden';} if(setup_editor.ui&&setup_editor.ui!=0){set_ui(setup_editor.ui);} if(!setup_editor.pvw){setup_editor.pvw=[640,480];} - else{html.style.overflow='auto';} + else{html.style.overflow=(navigator.userAgent.indexOf('Firefox')>0)?'hidden':'auto';} if(setup_editor.lines_anim){document.querySelector(':root').style.setProperty('--ls','20');}else{document.querySelector(':root').style.setProperty('--ls','0');} document.getElementById('screen_size').getElementsByTagName('option')[1].value=(setup_editor.pvw[0]>=setup_editor.pvw[1])?setup_editor.pvw[0]:setup_editor.pvw[1] } @@ -1367,6 +1368,7 @@ function movie_dlock(id){ var focus_block=document.getElementById(id); focus_block.onmousedown=function(e){ + if(e.button==1){e.preventDefault();} story_blocks.appendChild(focus_block); menu_add.style.visibility="hidden"; var coords=getCoords(focus_block); @@ -1443,7 +1445,7 @@ var startmove_x=null,startmove_y=null,scroll_x=null,scroll_y=null,scroll_xz=null,scroll_yz=null,dictat_m=0,dictat_s=0; html.ontouchstart=function(e){ if(!scroll_block||(scene_screen&&!scene_scroll)){ - html.style.overflow='scroll'; + html.style.overflow=(navigator.userAgent.indexOf('Firefox')>0)?'hidden':'scroll'; if(e.touches.length>1){dictat_s=Math.sqrt((e.touches[0].clientX-e.touches[1].clientX)**2+(e.touches[0].clientY-e.touches[1].clientY)**2)} html.ontouchmove=function(e){ if(e.touches.length>1&&!scene_screen){ @@ -1457,7 +1459,7 @@ startmove_y=null; html.ontouchmove=null; html.ontouchend=null; - scene_view.style.overflow="auto"; + scene_view.style.overflow=(navigator.userAgent.indexOf('Firefox')>0)?'hidden':'auto'; scale=Math.min(2,Math.max(0.25,(scale+dictat_m)));dictat_m=0; scroll_z(); }; @@ -1478,13 +1480,14 @@ startmove_y=null; scene_view.ontouchmove=null; scene_view.ontouchend=null; - scene_view.style.overflow="auto"; + scene_view.style.overflow=(navigator.userAgent.indexOf('Firefox')>0)?'hidden':'auto'; scale_scene=Math.min(2,Math.max(0.25,(scale_scene+dictat_m)));dictat_m=0; scroll_z(); }; } } world.onmousedown=function(e){ + if(e.button==1){e.preventDefault();} if(!scroll_block&&!scene_screen){ startmove_x=e.clientX; startmove_y=e.clientY; @@ -1510,6 +1513,7 @@ } } scene_view.onmousedown=function(e){ + if(e.button==1){e.preventDefault();} if(scene_screen&&scene_scroll){ startmove_x=e.clientX; startmove_y=e.clientY; @@ -1544,7 +1548,7 @@ menu_add.style.visibility="hidden"; window_zone.style.visibility="hidden" window_zone.style.backgroundColor='rgba(110,95,165,0)'; - if(!scene_screen){html.style.overflow='scroll';scroll_block=false;} + if(!scene_screen){html.style.overflow=(navigator.userAgent.indexOf('Firefox')>0)?'hidden':'scroll';;scroll_block=false;} window_zone.innerHTML=""; }else if(action=='open'&&window_zone.style.visibility!="visible"){ window_zone.style.visibility="visible"; @@ -1662,7 +1666,7 @@ +"" +"
" - +"

Crear proyecto
" + +"

Crear proyecto
" modal_window("open",html); } function build(tip){ @@ -2671,7 +2675,7 @@ }else{ tool_update=false; tools_zone.style.visibility="hidden"; - html.style.overflow='scroll'; + html.style.overflow=(navigator.userAgent.indexOf('Firefox')>0)?'hidden':'scroll';; menu_panel.style.zIndex=null; tools_zone.innerHTML=""; scroll_block=false;scene_screen=false; @@ -2690,6 +2694,7 @@ } function adden_scroll(id,z){ id.onmousedown=function(e){ + if(e.button==1){e.preventDefault();} if(scene_scroll){ startmove_x=e.clientX; startmove_y=e.clientY; @@ -2727,7 +2732,7 @@ startmove_y=null; this.ontouchmove=null; this.ontouchend=null; - scene_view.style.overflow="auto"; + scene_view.style.overflow=(navigator.userAgent.indexOf('Firefox')>0)?'hidden':'auto'; tool_scale=Math.min(2,Math.max(0.25,(tool_scale+dictat_m)));dictat_m=0; }; }} @@ -3435,7 +3440,8 @@ scene_layout.style.backgroundSize=((!story_script[block][i].background_size)?"cover":story_script[block][i].background_size); scene_layout.style.backgroundPosition=((!story_script[block][i].background_align)?"center":story_script[block][i].background_align); scene_layout.style.backgroundColor=story_script[block][i].background_color; - if(!scene_screen){ + scene_view.style.overflow=(navigator.userAgent.indexOf('Firefox')>0)?'hidden':'auto'; + if(!scene_screen){ scene_view.scrollTop=(screen_preview.clientHeight/2)-(scene_view.clientHeight/2); scene_view.scrollLeft=(screen_preview.clientWidth/2)-(scene_view.clientWidth/2); } @@ -5183,6 +5189,7 @@ else if(e.keyCode == '39'){if(objFocus){scene_view.style.overflow='scroll'}} } s.onmousedown=function(e){ + if(e.button==1){e.preventDefault();} if(moveSize){ e=e||window.event; e.preventDefault(); @@ -5628,7 +5635,7 @@ if(tools_zone.style.visibility=="visible"){ tool_update=false; tools_zone.style.visibility="hidden"; - html.style.overflow='scroll'; + html.style.overflow=(navigator.userAgent.indexOf('Firefox')>0)?'hidden':'scroll';; menu_panel.style.zIndex=null; tools_zone.innerHTML=""; scroll_block=false;scene_screen=false; diff --git a/translate/ja_tuesday_visual.html b/translate/ja_tuesday_visual.html index e618058..fbc8c0f 100644 --- a/translate/ja_tuesday_visual.html +++ b/translate/ja_tuesday_visual.html @@ -453,6 +453,7 @@ outline:none; resize:none; padding:8px; + tab-size:4; margin:0; } .code_text{ @@ -871,7 +872,7 @@ },"screen_control":{ "name":"画面操作", "text":"画面のクリック又はタップでダイアログを進行します", - "code":"let tue_screen_control=!0;tuesday.addEventListener(\"mouseup\",function(e){tue_screen_control&&e.pageX>tuesday.offsetWidth/3?(0==story_json[tue_story][scene].dialogs||check_choice(story_json[tue_story][scene].dialogs))&&go_story():(0==story_json[tue_story][scene].dialogs||check_choice(story_json[tue_story][scene].dialogs)&&tue_screen_control)&&back_story(),tue_screen_control=!0}),tuesday.addEventListener(\"script_loaded\",function(e){document.getElementById(\"tue_back\")&&(tue_back.style.pointerEvents=\"none\"),document.getElementById(\"tue_next\")&&(tue_next.style.pointerEvents=\"none\");for(var t=document.getElementById(\"tuesday\").getElementsByClassName(\"tue_controll\"),n=0;n0)?'hidden':'auto';} if(setup_editor.lines_anim){document.querySelector(':root').style.setProperty('--ls','20');}else{document.querySelector(':root').style.setProperty('--ls','0');} document.getElementById('screen_size').getElementsByTagName('option')[1].value=(setup_editor.pvw[0]>=setup_editor.pvw[1])?setup_editor.pvw[0]:setup_editor.pvw[1] } @@ -1367,6 +1368,7 @@ function movie_dlock(id){ var focus_block=document.getElementById(id); focus_block.onmousedown=function(e){ + if(e.button==1){e.preventDefault();} story_blocks.appendChild(focus_block); menu_add.style.visibility="hidden"; var coords=getCoords(focus_block); @@ -1443,7 +1445,7 @@ var startmove_x=null,startmove_y=null,scroll_x=null,scroll_y=null,scroll_xz=null,scroll_yz=null,dictat_m=0,dictat_s=0; html.ontouchstart=function(e){ if(!scroll_block||(scene_screen&&!scene_scroll)){ - html.style.overflow='scroll'; + html.style.overflow=(navigator.userAgent.indexOf('Firefox')>0)?'hidden':'scroll'; if(e.touches.length>1){dictat_s=Math.sqrt((e.touches[0].clientX-e.touches[1].clientX)**2+(e.touches[0].clientY-e.touches[1].clientY)**2)} html.ontouchmove=function(e){ if(e.touches.length>1&&!scene_screen){ @@ -1457,7 +1459,7 @@ startmove_y=null; html.ontouchmove=null; html.ontouchend=null; - scene_view.style.overflow="auto"; + scene_view.style.overflow=(navigator.userAgent.indexOf('Firefox')>0)?'hidden':'auto'; scale=Math.min(2,Math.max(0.25,(scale+dictat_m)));dictat_m=0; scroll_z(); }; @@ -1478,13 +1480,14 @@ startmove_y=null; scene_view.ontouchmove=null; scene_view.ontouchend=null; - scene_view.style.overflow="auto"; + scene_view.style.overflow=(navigator.userAgent.indexOf('Firefox')>0)?'hidden':'auto'; scale_scene=Math.min(2,Math.max(0.25,(scale_scene+dictat_m)));dictat_m=0; scroll_z(); }; } } world.onmousedown=function(e){ + if(e.button==1){e.preventDefault();} if(!scroll_block&&!scene_screen){ startmove_x=e.clientX; startmove_y=e.clientY; @@ -1510,6 +1513,7 @@ } } scene_view.onmousedown=function(e){ + if(e.button==1){e.preventDefault();} if(scene_screen&&scene_scroll){ startmove_x=e.clientX; startmove_y=e.clientY; @@ -1544,7 +1548,7 @@ menu_add.style.visibility="hidden"; window_zone.style.visibility="hidden" window_zone.style.backgroundColor='rgba(110,95,165,0)'; - if(!scene_screen){html.style.overflow='scroll';scroll_block=false;} + if(!scene_screen){html.style.overflow=(navigator.userAgent.indexOf('Firefox')>0)?'hidden':'scroll';;scroll_block=false;} window_zone.innerHTML=""; }else if(action=='open'&&window_zone.style.visibility!="visible"){ window_zone.style.visibility="visible"; @@ -1662,7 +1666,7 @@ +"" +"
" - +"

プロジェクト作成
" + +"

プロジェクト作成
" modal_window("open",html); } function build(tip){ @@ -2671,7 +2675,7 @@ }else{ tool_update=false; tools_zone.style.visibility="hidden"; - html.style.overflow='scroll'; + html.style.overflow=(navigator.userAgent.indexOf('Firefox')>0)?'hidden':'scroll';; menu_panel.style.zIndex=null; tools_zone.innerHTML=""; scroll_block=false;scene_screen=false; @@ -2690,6 +2694,7 @@ } function adden_scroll(id,z){ id.onmousedown=function(e){ + if(e.button==1){e.preventDefault();} if(scene_scroll){ startmove_x=e.clientX; startmove_y=e.clientY; @@ -2727,7 +2732,7 @@ startmove_y=null; this.ontouchmove=null; this.ontouchend=null; - scene_view.style.overflow="auto"; + scene_view.style.overflow=(navigator.userAgent.indexOf('Firefox')>0)?'hidden':'auto'; tool_scale=Math.min(2,Math.max(0.25,(tool_scale+dictat_m)));dictat_m=0; }; }} @@ -3435,7 +3440,8 @@ scene_layout.style.backgroundSize=((!story_script[block][i].background_size)?"cover":story_script[block][i].background_size); scene_layout.style.backgroundPosition=((!story_script[block][i].background_align)?"center":story_script[block][i].background_align); scene_layout.style.backgroundColor=story_script[block][i].background_color; - if(!scene_screen){ + scene_view.style.overflow=(navigator.userAgent.indexOf('Firefox')>0)?'hidden':'auto'; + if(!scene_screen){ scene_view.scrollTop=(screen_preview.clientHeight/2)-(scene_view.clientHeight/2); scene_view.scrollLeft=(screen_preview.clientWidth/2)-(scene_view.clientWidth/2); } @@ -5183,6 +5189,7 @@ else if(e.keyCode == '39'){if(objFocus){scene_view.style.overflow='scroll'}} } s.onmousedown=function(e){ + if(e.button==1){e.preventDefault();} if(moveSize){ e=e||window.event; e.preventDefault(); @@ -5628,7 +5635,7 @@ if(tools_zone.style.visibility=="visible"){ tool_update=false; tools_zone.style.visibility="hidden"; - html.style.overflow='scroll'; + html.style.overflow=(navigator.userAgent.indexOf('Firefox')>0)?'hidden':'scroll';; menu_panel.style.zIndex=null; tools_zone.innerHTML=""; scroll_block=false;scene_screen=false; diff --git a/translate/ru_tuesday_visual.html b/translate/ru_tuesday_visual.html index f94568a..fe10d09 100644 --- a/translate/ru_tuesday_visual.html +++ b/translate/ru_tuesday_visual.html @@ -453,6 +453,7 @@ outline:none; resize:none; padding:8px; + tab-size:4; margin:0; } .code_text{ @@ -871,7 +872,7 @@ },"screen_control":{ "name":"Нажатие на экран", "text":"переключение диалогов по клику или нажатию на экран.", - "code":"let tue_screen_control=!0;tuesday.addEventListener(\"mouseup\",function(e){tue_screen_control&&e.pageX>tuesday.offsetWidth/3?(0==story_json[tue_story][scene].dialogs||check_choice(story_json[tue_story][scene].dialogs))&&go_story():(0==story_json[tue_story][scene].dialogs||check_choice(story_json[tue_story][scene].dialogs)&&tue_screen_control)&&back_story(),tue_screen_control=!0}),tuesday.addEventListener(\"script_loaded\",function(e){document.getElementById(\"tue_back\")&&(tue_back.style.pointerEvents=\"none\"),document.getElementById(\"tue_next\")&&(tue_next.style.pointerEvents=\"none\");for(var t=document.getElementById(\"tuesday\").getElementsByClassName(\"tue_controll\"),n=0;n0)?'hidden':'auto';} if(setup_editor.lines_anim){document.querySelector(':root').style.setProperty('--ls','20');}else{document.querySelector(':root').style.setProperty('--ls','0');} document.getElementById('screen_size').getElementsByTagName('option')[1].value=(setup_editor.pvw[0]>=setup_editor.pvw[1])?setup_editor.pvw[0]:setup_editor.pvw[1] } @@ -1367,6 +1368,7 @@ function movie_dlock(id){ var focus_block=document.getElementById(id); focus_block.onmousedown=function(e){ + if(e.button==1){e.preventDefault();} story_blocks.appendChild(focus_block); menu_add.style.visibility="hidden"; var coords=getCoords(focus_block); @@ -1443,7 +1445,7 @@ var startmove_x=null,startmove_y=null,scroll_x=null,scroll_y=null,scroll_xz=null,scroll_yz=null,dictat_m=0,dictat_s=0; html.ontouchstart=function(e){ if(!scroll_block||(scene_screen&&!scene_scroll)){ - html.style.overflow='scroll'; + html.style.overflow=(navigator.userAgent.indexOf('Firefox')>0)?'hidden':'scroll'; if(e.touches.length>1){dictat_s=Math.sqrt((e.touches[0].clientX-e.touches[1].clientX)**2+(e.touches[0].clientY-e.touches[1].clientY)**2)} html.ontouchmove=function(e){ if(e.touches.length>1&&!scene_screen){ @@ -1457,7 +1459,7 @@ startmove_y=null; html.ontouchmove=null; html.ontouchend=null; - scene_view.style.overflow="auto"; + scene_view.style.overflow=(navigator.userAgent.indexOf('Firefox')>0)?'hidden':'auto'; scale=Math.min(2,Math.max(0.25,(scale+dictat_m)));dictat_m=0; scroll_z(); }; @@ -1478,13 +1480,14 @@ startmove_y=null; scene_view.ontouchmove=null; scene_view.ontouchend=null; - scene_view.style.overflow="auto"; + scene_view.style.overflow=(navigator.userAgent.indexOf('Firefox')>0)?'hidden':'auto'; scale_scene=Math.min(2,Math.max(0.25,(scale_scene+dictat_m)));dictat_m=0; scroll_z(); }; } } world.onmousedown=function(e){ + if(e.button==1){e.preventDefault();} if(!scroll_block&&!scene_screen){ startmove_x=e.clientX; startmove_y=e.clientY; @@ -1510,6 +1513,7 @@ } } scene_view.onmousedown=function(e){ + if(e.button==1){e.preventDefault();} if(scene_screen&&scene_scroll){ startmove_x=e.clientX; startmove_y=e.clientY; @@ -1544,7 +1548,7 @@ menu_add.style.visibility="hidden"; window_zone.style.visibility="hidden" window_zone.style.backgroundColor='rgba(110,95,165,0)'; - if(!scene_screen){html.style.overflow='scroll';scroll_block=false;} + if(!scene_screen){html.style.overflow=(navigator.userAgent.indexOf('Firefox')>0)?'hidden':'scroll';;scroll_block=false;} window_zone.innerHTML=""; }else if(action=='open'&&window_zone.style.visibility!="visible"){ window_zone.style.visibility="visible"; @@ -1634,7 +1638,7 @@ +"Onigi" +"Arne Krause" +"" - +"



" + +"



" modal_window("open",html); } function build_choice(){ @@ -1662,7 +1666,7 @@ +"" +"
" - +"

Создать проект
" + +"

Создать проект
" modal_window("open",html); } function build(tip){ @@ -2671,7 +2675,7 @@ }else{ tool_update=false; tools_zone.style.visibility="hidden"; - html.style.overflow='scroll'; + html.style.overflow=(navigator.userAgent.indexOf('Firefox')>0)?'hidden':'scroll';; menu_panel.style.zIndex=null; tools_zone.innerHTML=""; scroll_block=false;scene_screen=false; @@ -2690,6 +2694,7 @@ } function adden_scroll(id,z){ id.onmousedown=function(e){ + if(e.button==1){e.preventDefault();} if(scene_scroll){ startmove_x=e.clientX; startmove_y=e.clientY; @@ -2727,7 +2732,7 @@ startmove_y=null; this.ontouchmove=null; this.ontouchend=null; - scene_view.style.overflow="auto"; + scene_view.style.overflow=(navigator.userAgent.indexOf('Firefox')>0)?'hidden':'auto'; tool_scale=Math.min(2,Math.max(0.25,(tool_scale+dictat_m)));dictat_m=0; }; }} @@ -3435,7 +3440,8 @@ scene_layout.style.backgroundSize=((!story_script[block][i].background_size)?"cover":story_script[block][i].background_size); scene_layout.style.backgroundPosition=((!story_script[block][i].background_align)?"center":story_script[block][i].background_align); scene_layout.style.backgroundColor=story_script[block][i].background_color; - if(!scene_screen){ + scene_view.style.overflow=(navigator.userAgent.indexOf('Firefox')>0)?'hidden':'auto'; + if(!scene_screen){ scene_view.scrollTop=(screen_preview.clientHeight/2)-(scene_view.clientHeight/2); scene_view.scrollLeft=(screen_preview.clientWidth/2)-(scene_view.clientWidth/2); } @@ -5183,6 +5189,7 @@ else if(e.keyCode == '39'){if(objFocus){scene_view.style.overflow='scroll'}} } s.onmousedown=function(e){ + if(e.button==1){e.preventDefault();} if(moveSize){ e=e||window.event; e.preventDefault(); @@ -5628,7 +5635,7 @@ if(tools_zone.style.visibility=="visible"){ tool_update=false; tools_zone.style.visibility="hidden"; - html.style.overflow='scroll'; + html.style.overflow=(navigator.userAgent.indexOf('Firefox')>0)?'hidden':'scroll';; menu_panel.style.zIndex=null; tools_zone.innerHTML=""; scroll_block=false;scene_screen=false; diff --git a/tuesday_visual.html b/tuesday_visual.html index bb79d22..57dc93a 100755 --- a/tuesday_visual.html +++ b/tuesday_visual.html @@ -872,7 +872,7 @@ },"screen_control":{ "name":"Screen control", "text":"switches dialogue by click to screen.", - "code":"let tue_screen_control=!0;tuesday.addEventListener(\"mouseup\",function(e){tue_screen_control&&e.pageX>tuesday.offsetWidth/3?(0==story_json[tue_story][scene].dialogs||check_choice(story_json[tue_story][scene].dialogs))&&go_story():(0==story_json[tue_story][scene].dialogs||check_choice(story_json[tue_story][scene].dialogs)&&tue_screen_control)&&back_story(),tue_screen_control=!0}),tuesday.addEventListener(\"script_loaded\",function(e){document.getElementById(\"tue_back\")&&(tue_back.style.pointerEvents=\"none\"),document.getElementById(\"tue_next\")&&(tue_next.style.pointerEvents=\"none\");for(var t=document.getElementById(\"tuesday\").getElementsByClassName(\"tue_controll\"),n=0;nreading text with a synthesized voice",