Menu
▾
▴
[mxbb-commits] mx_simpledoc/simpledoc/includes/js init_main.js, 1.1, 1.2 init_view.js, 1.1, 1.2 management.js.php, 1.1, 1.2 request.js.php, 1.1, 1.2
|
From: Jon O. <jon...@us...> - 2006-09-17 14:39:28
|
Update of /cvsroot/mxbb/mx_simpledoc/simpledoc/includes/js In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv25469/modules/mx_simpledoc/simpledoc/includes/js Modified Files: init_main.js init_view.js management.js.php request.js.php Log Message: Ok, several annoying JS bugs and more are solved... Index: init_main.js =================================================================== RCS file: /cvsroot/mxbb/mx_simpledoc/simpledoc/includes/js/init_main.js,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** init_main.js 23 Apr 2006 19:21:27 -0000 1.1 --- init_main.js 17 Sep 2006 14:39:23 -0000 1.2 *************** *** 9,16 **** window.onload = initialize; ! tree.textClickListener.add(function() { ! if (document.getElementById("tree-insert-form").style.display == "block") { ! treeInsert(); ! } }); --- 9,16 ---- window.onload = initialize; ! tree.textClickListener.add(function() { ! if (document.getElementById("tree-insert-form").style.display == "block") { ! treeInsert(); ! } }); *************** *** 31,36 **** } }); ! ! tree.textClickListener.add(function() { if (tree.getActiveNode().isDocument()) { if (getCookie('openEditContent')) editContent(); --- 31,36 ---- } }); ! ! tree.textClickListener.add(function() { if (tree.getActiveNode().isDocument()) { if (getCookie('openEditContent')) editContent(); *************** *** 51,61 **** dhtmlHistory.addListener(handleHistoryChange); ! if (dhtmlHistory.isFirstLoad()) { // determine our current location so we can initialize ourselves at startup var initialLocation = dhtmlHistory.getCurrentLocation(); // if no location specified, use the default ! if (initialLocation == '' || initialLocation == null) { if (tree.allNodes[0].childNodes) { for (var i = 0; i < tree.allNodes[0].childNodes.length; i++) { if (tree.allNodes[0].childNodes[i].isDocument()) { --- 51,65 ---- dhtmlHistory.addListener(handleHistoryChange); ! if (dhtmlHistory.isFirstLoad()) ! { // determine our current location so we can initialize ourselves at startup var initialLocation = dhtmlHistory.getCurrentLocation(); // if no location specified, use the default ! if ((initialLocation == '' || initialLocation == null) && tree.allNodes[0]) ! { if (tree.allNodes[0].childNodes) { + // First set default, then loop to find real document + queryPath = tree.allNodes[0].id; for (var i = 0; i < tree.allNodes[0].childNodes.length; i++) { if (tree.allNodes[0].childNodes[i].isDocument()) { *************** *** 63,67 **** break; } ! } } else --- 67,71 ---- break; } ! } } else *************** *** 69,77 **** queryPath = tree.allNodes[0].id; } initialLocation = queryPath.replace('tree-', ""); ! } ! // now initialize our starting UI ! updateUI(initialLocation, null); } } --- 73,85 ---- queryPath = tree.allNodes[0].id; } + initialLocation = queryPath.replace('tree-', ""); ! } ! // now initialize our starting UI ! if (tree.allNodes[0]) ! { ! updateUI(initialLocation, null); ! } } } *************** *** 82,86 **** function handleHistoryChange(newLocation, historyData) { // use the history data to update our UI ! updateUI(newLocation, historyData); } --- 90,94 ---- function handleHistoryChange(newLocation, historyData) { // use the history data to update our UI ! updateUI(newLocation, historyData); } *************** *** 124,128 **** function treeMoveUp() { ! if (tree.mayMoveUp() && httpSave("modules/mx_simpledoc/simpledoc/modules/simpledoc__node.php?do=moveUp&id="+escape(treeGetId())+'&block_id='+mxBlock.block_id+'&page_id='+mxBlock.page_id)) { tree.moveUp(); } else { --- 132,136 ---- function treeMoveUp() { ! if (tree.mayMoveUp() && httpSave("modules/mx_simpledoc/simpledoc/modules/simpledoc__node.php?do=moveUp&id="+encodeURIComponent(treeGetId())+'&block_id='+mxBlock.block_id+'&page_id='+mxBlock.page_id)) { tree.moveUp(); } else { *************** *** 131,135 **** } function treeMoveDown() { ! if (tree.mayMoveDown() && httpSave("modules/mx_simpledoc/simpledoc/modules/simpledoc__node.php?do=moveDown&id="+escape(treeGetId())+'&block_id='+mxBlock.block_id+'&page_id='+mxBlock.page_id)) { tree.moveDown(); } else { --- 139,143 ---- } function treeMoveDown() { ! if (tree.mayMoveDown() && httpSave("modules/mx_simpledoc/simpledoc/modules/simpledoc__node.php?do=moveDown&id="+encodeURIComponent(treeGetId())+'&block_id='+mxBlock.block_id+'&page_id='+mxBlock.page_id)) { tree.moveDown(); } else { *************** *** 138,142 **** } function treeMoveLeft() { ! if (tree.mayMoveLeft() && httpSave("modules/mx_simpledoc/simpledoc/modules/simpledoc__node.php?do=moveLeft&id="+escape(treeGetId())+'&block_id='+mxBlock.block_id+'&page_id='+mxBlock.page_id)) { tree.moveLeft(); } else { --- 146,150 ---- } function treeMoveLeft() { ! if (tree.mayMoveLeft() && httpSave("modules/mx_simpledoc/simpledoc/modules/simpledoc__node.php?do=moveLeft&id="+encodeURIComponent(treeGetId())+'&block_id='+mxBlock.block_id+'&page_id='+mxBlock.page_id)) { tree.moveLeft(); } else { *************** *** 145,149 **** } function treeMoveRight() { ! if (tree.mayMoveRight() && httpSave("modules/mx_simpledoc/simpledoc/modules/simpledoc__node.php?do=moveRight&id="+escape(treeGetId())+'&block_id='+mxBlock.block_id+'&page_id='+mxBlock.page_id)) { tree.moveRight(); } else { --- 153,157 ---- } function treeMoveRight() { ! if (tree.mayMoveRight() && httpSave("modules/mx_simpledoc/simpledoc/modules/simpledoc__node.php?do=moveRight&id="+encodeURIComponent(treeGetId())+'&block_id='+mxBlock.block_id+'&page_id='+mxBlock.page_id)) { tree.moveRight(); } else { *************** *** 182,186 **** name.value = name.value.substr(0, name.value.length-5); } ! var id = escape(name.value); if (type.value != "folder") { id = name.value + ".html"; --- 190,194 ---- name.value = name.value.substr(0, name.value.length-5); } ! var id = encodeURIComponent(name.value); if (type.value != "folder") { id = name.value + ".html"; *************** *** 189,209 **** switch (where.value) { case "before": ! alert("&id="+escape(treeGetId())+"&name="+id+"&is_folder="+(type.value=="folder" ? 1 : 0)+'&block_id='+mxBlock.block_id+'&page_id='+mxBlock.page_id); ! if (httpSave("modules/mx_simpledoc/simpledoc/modules/simpledoc__node.php?do=insertBefore&id="+escape(treeGetId())+"&name="+id+"&is_folder="+(type.value=="folder" ? 1 : 0)+'&block_id='+mxBlock.block_id+'&page_id='+mxBlock.page_id)) { tree.insertBefore(id, name.value, type.value); } break; case "after": ! if (httpSave("modules/mx_simpledoc/simpledoc/modules/simpledoc__node.php?do=insertAfter&id="+escape(treeGetId())+"&name="+id+"&is_folder="+(type.value=="folder" ? 1 : 0)+'&block_id='+mxBlock.block_id+'&page_id='+mxBlock.page_id)) { tree.insertAfter(id, name.value, type.value); } break; case "inside_start": ! if (httpSave("modules/mx_simpledoc/simpledoc/modules/simpledoc__node.php?do=insertInsideAtStart&id="+escape(treeGetId())+"&name="+id+"&is_folder="+(type.value=="folder" ? 1 : 0)+'&block_id='+mxBlock.block_id+'&page_id='+mxBlock.page_id)) { tree.insertInsideAtStart(id, name.value, type.value); } break; case "inside_end": ! if (httpSave("modules/mx_simpledoc/simpledoc/modules/simpledoc__node.php?do=insertInsideAtEnd&id="+escape(treeGetId())+"&name="+id+"&is_folder="+(type.value=="folder" ? 1 : 0)+'&block_id='+mxBlock.block_id+'&page_id='+mxBlock.page_id)) { tree.insertInsideAtEnd(id, name.value, type.value); } --- 197,217 ---- switch (where.value) { case "before": ! //alert("&id="+encodeURIComponent(treeGetId())+"&name="+id+"&is_folder="+(type.value=="folder" ? 1 : 0)+'&block_id='+mxBlock.block_id+'&page_id='+mxBlock.page_id); ! if (httpSave("modules/mx_simpledoc/simpledoc/modules/simpledoc__node.php?do=insertBefore&id="+encodeURIComponent(treeGetId())+"&name="+id+"&is_folder="+(type.value=="folder" ? 1 : 0)+'&block_id='+mxBlock.block_id+'&page_id='+mxBlock.page_id)) { tree.insertBefore(id, name.value, type.value); } break; case "after": ! if (httpSave("modules/mx_simpledoc/simpledoc/modules/simpledoc__node.php?do=insertAfter&id="+encodeURIComponent(treeGetId())+"&name="+id+"&is_folder="+(type.value=="folder" ? 1 : 0)+'&block_id='+mxBlock.block_id+'&page_id='+mxBlock.page_id)) { tree.insertAfter(id, name.value, type.value); } break; case "inside_start": ! if (httpSave("modules/mx_simpledoc/simpledoc/modules/simpledoc__node.php?do=insertInsideAtStart&id="+encodeURIComponent(treeGetId())+"&name="+id+"&is_folder="+(type.value=="folder" ? 1 : 0)+'&block_id='+mxBlock.block_id+'&page_id='+mxBlock.page_id)) { tree.insertInsideAtStart(id, name.value, type.value); } break; case "inside_end": ! if (httpSave("modules/mx_simpledoc/simpledoc/modules/simpledoc__node.php?do=insertInsideAtEnd&id="+encodeURIComponent(treeGetId())+"&name="+id+"&is_folder="+(type.value=="folder" ? 1 : 0)+'&block_id='+mxBlock.block_id+'&page_id='+mxBlock.page_id)) { tree.insertInsideAtEnd(id, name.value, type.value); } *************** *** 211,215 **** } } else { ! if (httpSave("modules/mx_simpledoc/simpledoc/modules/simpledoc__node.php?do=insert&id="+escape(treeGetId())+"&name="+id+"&is_folder="+(type.value=="folder" ? 1 : 0)+'&block_id='+mxBlock.block_id+'&page_id='+mxBlock.page_id)) { tree.insert(id, name.value, type.value); } --- 219,223 ---- } } else { ! if (httpSave("modules/mx_simpledoc/simpledoc/modules/simpledoc__node.php?do=insert&id="+encodeURIComponent(treeGetId())+"&name="+id+"&is_folder="+(type.value=="folder" ? 1 : 0)+'&block_id='+mxBlock.block_id+'&page_id='+mxBlock.page_id)) { tree.insert(id, name.value, type.value); } *************** *** 228,232 **** if (tree.mayRemove()) { if (confirm("Delete current node ?")) { ! if (httpSave("modules/mx_simpledoc/simpledoc/modules/simpledoc__node.php?do=remove&id="+escape(treeGetId())+'&block_id='+mxBlock.block_id+'&page_id='+mxBlock.page_id)) { tree.remove(); if (document.getElementById("tree-insert-form").style.display == "block") { --- 236,240 ---- if (tree.mayRemove()) { if (confirm("Delete current node ?")) { ! if (httpSave("modules/mx_simpledoc/simpledoc/modules/simpledoc__node.php?do=remove&id="+encodeURIComponent(treeGetId())+'&block_id='+mxBlock.block_id+'&page_id='+mxBlock.page_id)) { tree.remove(); if (document.getElementById("tree-insert-form").style.display == "block") { Index: request.js.php =================================================================== RCS file: /cvsroot/mxbb/mx_simpledoc/simpledoc/includes/js/request.js.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** request.js.php 23 Apr 2006 19:21:27 -0000 1.1 --- request.js.php 17 Sep 2006 14:39:23 -0000 1.2 *************** *** 88,92 **** } if (req.responseText.length) { ! return req.responseText; } return true; --- 88,93 ---- } if (req.responseText.length) { ! alert(req.responseText); ! return false; } return true; Index: init_view.js =================================================================== RCS file: /cvsroot/mxbb/mx_simpledoc/simpledoc/includes/js/init_view.js,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** init_view.js 23 Apr 2006 19:21:27 -0000 1.1 --- init_view.js 17 Sep 2006 14:39:23 -0000 1.2 *************** *** 14,18 **** documentView(); dhtmlHistory.add( treeGetId(), el(tree.active+"-text").innerHTML ); ! queryPath = tree.getActiveNode().id; tree.queryPath = queryPath.replace('tree-', ""); --- 14,18 ---- documentView(); dhtmlHistory.add( treeGetId(), el(tree.active+"-text").innerHTML ); ! queryPath = tree.getActiveNode().id; tree.queryPath = queryPath.replace('tree-', ""); *************** *** 25,29 **** { el('tabs-data').innerHTML = ""; ! } }); --- 25,29 ---- { el('tabs-data').innerHTML = ""; ! } }); *************** *** 31,44 **** tree.textClickListener.add(function() { if (!tree.getActiveNode().isDocument()) { ! generateParentTOC('view'); dhtmlHistory.add( treeGetId(), el(tree.active+"-text").innerHTML ); ! //queryPath = tree.getActiveNode().id; //tree.queryPath = queryPath.replace('tree-', ""); //tree.active = queryPath; //tree.loadState(); ! //tree.updateHtml(); ! //if (tree.getActiveNode().childNodes) { //for (var i = 0; i < tree.getActiveNode().childNodes.length; i++) { --- 31,44 ---- tree.textClickListener.add(function() { if (!tree.getActiveNode().isDocument()) { ! generateParentTOC('view'); dhtmlHistory.add( treeGetId(), el(tree.active+"-text").innerHTML ); ! //queryPath = tree.getActiveNode().id; //tree.queryPath = queryPath.replace('tree-', ""); //tree.active = queryPath; //tree.loadState(); ! //tree.updateHtml(); ! //if (tree.getActiveNode().childNodes) { //for (var i = 0; i < tree.getActiveNode().childNodes.length; i++) { *************** *** 59,73 **** // initialize RSH dhtmlHistory.initialize(); ! // add ourselves as a listener for history change events dhtmlHistory.addListener(handleHistoryChange); ! ! if (dhtmlHistory.isFirstLoad()) { // determine our current location so we can initialize ourselves at startup var initialLocation = dhtmlHistory.getCurrentLocation(); // if no location specified, use the default ! if (initialLocation == '' || initialLocation == null) { if (tree.allNodes[0].childNodes) { for (var i = 0; i < tree.allNodes[0].childNodes.length; i++) { if (tree.allNodes[0].childNodes[i].isDocument()) { --- 59,77 ---- // initialize RSH dhtmlHistory.initialize(); ! // add ourselves as a listener for history change events dhtmlHistory.addListener(handleHistoryChange); ! ! if (dhtmlHistory.isFirstLoad()) ! { // determine our current location so we can initialize ourselves at startup var initialLocation = dhtmlHistory.getCurrentLocation(); // if no location specified, use the default ! if ((initialLocation == '' || initialLocation == null) && tree.allNodes[0]) ! { if (tree.allNodes[0].childNodes) { + // First set default, then loop to find real document + queryPath = tree.allNodes[0].id; for (var i = 0; i < tree.allNodes[0].childNodes.length; i++) { if (tree.allNodes[0].childNodes[i].isDocument()) { *************** *** 75,79 **** break; } ! } } else --- 79,83 ---- break; } ! } } else *************** *** 82,89 **** } initialLocation = queryPath.replace('tree-', ""); ! } ! // now initialize our starting UI ! updateUI(initialLocation, null); } } --- 86,96 ---- } initialLocation = queryPath.replace('tree-', ""); ! } ! // now initialize our starting UI ! if (tree.allNodes[0]) ! { ! updateUI(initialLocation, null); ! } } } *************** *** 94,98 **** function handleHistoryChange(newLocation, historyData) { // use the history data to update our UI ! updateUI(newLocation, historyData); } --- 101,105 ---- function handleHistoryChange(newLocation, historyData) { // use the history data to update our UI ! updateUI(newLocation, historyData); } Index: management.js.php =================================================================== RCS file: /cvsroot/mxbb/mx_simpledoc/simpledoc/includes/js/management.js.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** management.js.php 23 Apr 2006 19:21:27 -0000 1.1 --- management.js.php 17 Sep 2006 14:39:23 -0000 1.2 *************** *** 69,73 **** ,'onTimeout':function(){ clearTabs(); tabsLoadingOff(); el('tabs-data').innerHTML = 'Timed out. Try again!'; } } ! ); } --- 69,73 ---- ,'onTimeout':function(){ clearTabs(); tabsLoadingOff(); el('tabs-data').innerHTML = 'Timed out. Try again!'; } } ! ); } *************** *** 78,82 **** } checkContentSaved(); ! AjaxRequest.get( { --- 78,82 ---- } checkContentSaved(); ! AjaxRequest.get( { *************** *** 90,94 **** ,'onTimeout':function(){ clearTabs(); tabsLoadingOff(); el('tabs-data').innerHTML = 'Timed out. Try again!'; } } ! ); } --- 90,94 ---- ,'onTimeout':function(){ clearTabs(); tabsLoadingOff(); el('tabs-data').innerHTML = 'Timed out. Try again!'; } } ! ); } *************** *** 111,115 **** return; } ! AjaxRequest.get( { --- 111,115 ---- return; } ! AjaxRequest.get( { *************** *** 123,127 **** ,'onTimeout':function(){ clearTabs(); tabsLoadingOff(); el('tabs-data').innerHTML = 'Timed out. Try again!'; } } ! ); } --- 123,127 ---- ,'onTimeout':function(){ clearTabs(); tabsLoadingOff(); el('tabs-data').innerHTML = 'Timed out. Try again!'; } } ! ); } *************** *** 131,135 **** return; } ! AjaxRequest.get( { --- 131,135 ---- return; } ! AjaxRequest.get( { *************** *** 143,151 **** ,'onTimeout':function(){ clearTabs(); tabsLoadingOff(); el('tabs-data').innerHTML = 'Timed out. Try again!'; } } ! ); } function saveContent(theform) { ! tabsSavingOn(); el('save-document').disabled = true; --- 143,151 ---- ,'onTimeout':function(){ clearTabs(); tabsLoadingOff(); el('tabs-data').innerHTML = 'Timed out. Try again!'; } } ! ); } function saveContent(theform) { ! tabsSavingOn(); el('save-document').disabled = true; *************** *** 158,169 **** } ); ! el('save-document').disabled = false; ! el('body-tmp').value = el('body').value; tabsSavingOff(); //var data = {"body": el('body').value} //var save = httpSave("modules/mx_simpledoc/simpledoc/modules/simpledoc__tab-save-content.php?id="+escape(treeGetId())+'&block_id='+mxBlock.block_id+'&page_id='+mxBlock.page_id, data); ! if ((typeof status == "boolean" && !status) || typeof status == "string") { alert("Unknown error, cannot save document."); --- 158,169 ---- } ); ! el('save-document').disabled = false; ! el('body-tmp').value = el('body').value; tabsSavingOff(); //var data = {"body": el('body').value} //var save = httpSave("modules/mx_simpledoc/simpledoc/modules/simpledoc__tab-save-content.php?id="+escape(treeGetId())+'&block_id='+mxBlock.block_id+'&page_id='+mxBlock.page_id, data); ! if ((typeof status == "boolean" && !status) || typeof status == "string") { alert("Unknown error, cannot save document."); *************** *** 173,177 **** savedTimerID = setTimeout(function(){ el("saved").innerHTML = ""; }, 3000); } ! return status; } --- 173,177 ---- savedTimerID = setTimeout(function(){ el("saved").innerHTML = ""; }, 3000); } ! return status; } *************** *** 182,188 **** var contents = ""; var link = escape(treeGetId()); ! contents = '<div><a target="_blank" href="index.php?page='+mxBlock.page_id+'&mode='+mode+'#'+link+'">Permanent Link to this page</a></div>'; ! var all = document.getElementById("tabs-data").childNodes; var contents2 = ""; --- 182,188 ---- var contents = ""; var link = escape(treeGetId()); ! contents = '<div><a target="_blank" href="index.php?page='+mxBlock.page_id+'&mode='+mode+'#'+link+'">Permanent Link to this page</a></div>'; ! var all = document.getElementById("tabs-data").childNodes; var contents2 = ""; *************** *** 190,199 **** var found = false; var h3 = false; ! contents2 += '<b>Contents</b><ul>'; for (var i = 0; i < all.length; ++i) { if (all[i].nodeName == "H2" || all[i].nodeName == "H3") { ! if (all[i].nodeName == "H2") { if (h3) contents2 += '</ul>'; --- 190,199 ---- var found = false; var h3 = false; ! contents2 += '<b>Contents</b><ul>'; for (var i = 0; i < all.length; ++i) { if (all[i].nodeName == "H2" || all[i].nodeName == "H3") { ! if (all[i].nodeName == "H2") { if (h3) contents2 += '</ul>'; *************** *** 204,208 **** h3 = true; } ! found = true; text = all[i].innerHTML.replace(/<[^>]+>/g,""); --- 204,208 ---- h3 = true; } ! found = true; text = all[i].innerHTML.replace(/<[^>]+>/g,""); *************** *** 210,214 **** contents2 += '<li><a href="index.php?page='+mxBlock.page_id+'&mode='+mode+'#'+text+'">'+text+'</a></li>'; } ! } contents2 += '</ul>'; --- 210,214 ---- contents2 += '<li><a href="index.php?page='+mxBlock.page_id+'&mode='+mode+'#'+text+'">'+text+'</a></li>'; } ! } contents2 += '</ul>'; *************** *** 233,241 **** var title = "<h1>Section Contents</h1>"; var s = ''; ! if(!document.getElementById("sectioncontents")) { document.getElementById("tabs-data").innerHTML = addTocDiv(''); } ! var node = tree.getActiveNode(); while (node && node.parentNode) { --- 233,241 ---- var title = "<h1>Section Contents</h1>"; var s = ''; ! if(!document.getElementById("sectioncontents")) { document.getElementById("tabs-data").innerHTML = addTocDiv(''); } ! var node = tree.getActiveNode(); while (node && node.parentNode) { *************** *** 244,250 **** } loc = '<a href="index.php?page='+mxBlock.page_id+'&mode='+mode+'">Table of Contents</a> ' + loc; ! node = tree.getActiveNode(); ! if (node.childNodes) { for (var i = 0; i < node.childNodes.length; i++) { contents2 += node.childNodes[i].toToc(); --- 244,250 ---- } loc = '<a href="index.php?page='+mxBlock.page_id+'&mode='+mode+'">Table of Contents</a> ' + loc; ! node = tree.getActiveNode(); ! if (node.childNodes) { for (var i = 0; i < node.childNodes.length; i++) { contents2 += node.childNodes[i].toToc(); *************** *** 253,257 **** contents2 = contents2 != '' ? title + contents2 : ''; contents = loc + ' <hr align="left"> ' + contents2; ! if (contents) { document.getElementById("sectioncontents").className = "sectioncontents"; --- 253,257 ---- contents2 = contents2 != '' ? title + contents2 : ''; contents = loc + ' <hr align="left"> ' + contents2; ! if (contents) { document.getElementById("sectioncontents").className = "sectioncontents"; *************** *** 276,293 **** // Remove all SCRIPT tags //html = html.replace(/<\s*SCRIPT[^>]*>([^<]*)<\/\s*SCRIPT\s*>/i, "" ); ! // Remove all SPAN tags ! //html = html.replace(/<\/?\s*SPAN[^>]*>/gi, "" ); ! // Remove all STYLE tags //html = html.replace(/<\s*STYLE[^>]*>([^<]*)<\/\s*STYLE\s*>/i, "" ); // Remove Class attributes //html = html.replace(/<\s*(\w[^>]*) class=([^ |>]*)([^>]*)/gi, "") ; // Remove Style attributes ! //html = html.replace(/<\s*(\w[^>]*) style="([^"]*)"([^>]*)/gi, "") ; ! ! html = html.replace(/<\s*br[^>]*>/gi,""); ! html = html.trim(); ! return html; } --- 276,293 ---- // Remove all SCRIPT tags //html = html.replace(/<\s*SCRIPT[^>]*>([^<]*)<\/\s*SCRIPT\s*>/i, "" ); ! // Remove all SPAN tags ! //html = html.replace(/<\/?\s*SPAN[^>]*>/gi, "" ); ! // Remove all STYLE tags //html = html.replace(/<\s*STYLE[^>]*>([^<]*)<\/\s*STYLE\s*>/i, "" ); // Remove Class attributes //html = html.replace(/<\s*(\w[^>]*) class=([^ |>]*)([^>]*)/gi, "") ; // Remove Style attributes ! //html = html.replace(/<\s*(\w[^>]*) style="([^"]*)"([^>]*)/gi, "") ; ! ! //html = html.replace(/<\s*br[^>]*>/gi,""); ! html = html.trim(); ! return html; } |
