Commit dc987cc0 authored by Chris Graham's avatar Chris Graham
Browse files

Fixed MANTIS-4427 (Full-screen mode in WYSIWYG stops block add tool scrolling working)

parent 508d6b57

themes/default/javascript/global.js

+1 −1
Original line number Diff line number Diff line
@@ -1533,7 +1533,7 @@ function animate_frame_load(pf,frame,leave_gap_top,leave_height) 
}

function illustrate_frame_load(pf,frame)

{

	pf.style.height='80px';

	pf.style.minHeight='80px';



	/*{+START,IF,{$CONFIG_OPTION,enable_animations}}*/

		var head='<style>',cssText='';

themes/default/javascript/modalwindow.js

+5 −4
Original line number Diff line number Diff line
@@ -367,7 +367,7 @@ function faux_showModalDialog(url,name,options,callback,target,cancel_text) 
					{

						if (bits[1]=='100%')

						{

							height=''+(get_window_height()-200);

							height=''+(get_window_height()-100);

						} else

						{

							height=bits[1].replace(/px$/,'');
@@ -545,6 +545,8 @@ function ModalWindow() 
		reset_dimensions: function(width,height,init,force_height) {

			if (typeof force_height=='undefined') force_height=false;



			if (window.top.document.documentElement.style.overflowY=='hidden') force_height=true;



			if (!this.box_wrapper) return;



			var dim=this.get_page_size();
@@ -727,7 +729,6 @@ function ModalWindow() 
			var _this=this;

			var width=this.width;

			var height=this.height;



			this.inject(this.box_wrapper);



			var container=this.element('div',{
@@ -837,11 +838,11 @@ function ModalWindow() 
			{

				case 'iframe':

					var iframe_width=(this.width.match(/^[\d\.]+$/)!==null)?((this.width-14)+'px'):this.width;

					var iframe_height=(this.height.match(/^[\d\.]+$/)!==null)?(this.height+'px'):((this.height=='auto')?(this.LOADING_SCREEN_HEIGHT+'px'):this.height);

					var iframe_height=(this.height.match(/^[\d\.]+$/)!==null)?((this.height-14	)+'px'):((this.height=='auto')?(this.LOADING_SCREEN_HEIGHT+'px'):this.height);



					var iframe=this.element('iframe',{

						'frameBorder': '0',

						'scrolling': 'no',

						'scrolling': (document.documentElement.style.overflowY=='hidden')?'yes':'no',

						'title': '',

						'name': 'overlay_iframe',

						'id': 'overlay_iframe',

themes/default/javascript/posting.js

+2 −1
Original line number Diff line number Diff line
@@ -355,7 +355,8 @@ function do_input_block(field_name) 
	if ((typeof window.event!='undefined') && (window.event)) window.event.returnValue=false;

	var url='{$FIND_SCRIPT;,block_helper}?field_name='+field_name+keep_stub();

	url=url+'&block_type='+(((field_name.indexOf('edit_panel_')==-1) && (window.location.href.indexOf(':panel_')==-1))?'main':'side');

	window.faux_open(maintain_theme_in_link(url),'','width=750,height=auto,status=no,resizable=yes,scrollbars=yes',null,'{!INPUTSYSTEM_CANCEL;^}');

	var height=(document.documentElement.style.overflowY=='hidden')?'100%':'auto';

	window.faux_open(maintain_theme_in_link(url),'','width=750,height='+height+',status=no,resizable=yes,scrollbars=yes',null,'{!INPUTSYSTEM_CANCEL;^}');

}



function do_input_comcode(field_name,tag)