diff --git a/modules/editor/components/multimedia_link/multimedia_link.class.php b/modules/editor/components/multimedia_link/multimedia_link.class.php index 7a35065f3..e1f0b5ba3 100644 --- a/modules/editor/components/multimedia_link/multimedia_link.class.php +++ b/modules/editor/components/multimedia_link/multimedia_link.class.php @@ -41,6 +41,7 @@ **/ function transHTML($xml_obj) { $src = $xml_obj->attrs->multimedia_src; + $style = $xml_obj->attrs->style; preg_match_all('/(width|height)([^[:digit:]]+)([0-9]+)/i',$style,$matches); $width = trim($matches[3][0]); diff --git a/modules/editor/tpl/js/editor.js b/modules/editor/tpl/js/editor.js index 0497f389e..fc9b2ee5f 100755 --- a/modules/editor/tpl/js/editor.js +++ b/modules/editor/tpl/js/editor.js @@ -154,7 +154,7 @@ function _editorAutoSave() { xTop("editor_autosaved_message", xScrollTop()+10); xGetElementById("editor_autosaved_message").style.display = "block"; - setTimeout(function() {xGetElementById("editor_autosaved_message").style.display = "none";}, 15000); + setTimeout(function() {xGetElementById("editor_autosaved_message").style.display = "none";}, 60*3*1000); show_waiting_message = false; exec_xml("editor","procEditorSaveDoc", params, _editorAutoSaved); show_waiting_message = true;