Commit 794ba0c6 authored by Alexander.Trofimov's avatar Alexander.Trofimov Committed by Alexander.Trofimov

delete duplicate CopyPasteCorrectString

delete duplicate declaration PASTE_ELEMENT_ID, ELEMENT_DISPAY_STYLE, PASTE_ELEMENT_ID2, ELEMENT_DISPAY_STYLE2

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@64850 954022d7-b5bf-4e40-9824-e11837661b57
parent 03f49504
...@@ -95,8 +95,8 @@ var copyPasteUseBinary = true; ...@@ -95,8 +95,8 @@ var copyPasteUseBinary = true;
if (window.USER_AGENT_SAFARI_MACOS) if (window.USER_AGENT_SAFARI_MACOS)
{ {
var PASTE_ELEMENT_ID = "SelectId"; PASTE_ELEMENT_ID = "SelectId";
var ELEMENT_DISPAY_STYLE = "block"; ELEMENT_DISPAY_STYLE = "block";
} }
var PASTE_EMPTY_COUNTER_MAX = 10; var PASTE_EMPTY_COUNTER_MAX = 10;
...@@ -2122,7 +2122,7 @@ function CanPaste(oDocument) ...@@ -2122,7 +2122,7 @@ function CanPaste(oDocument)
} }
} }
return true; return true;
}; }
function Editor_Paste(api, bClean) function Editor_Paste(api, bClean)
{ {
window.GlobalPasteFlagCounter = 1; window.GlobalPasteFlagCounter = 1;
...@@ -2248,7 +2248,7 @@ function Editor_Paste(api, bClean) ...@@ -2248,7 +2248,7 @@ function Editor_Paste(api, bClean)
PASTE_EMPTY_COUNTER = 0; PASTE_EMPTY_COUNTER = 0;
window.PasteEndTimerId = window.setTimeout( func_timeout, _interval_time ); window.PasteEndTimerId = window.setTimeout( func_timeout, _interval_time );
}; }
function CopyPasteCorrectString(str) function CopyPasteCorrectString(str)
{ {
var res = str; var res = str;
...@@ -2258,7 +2258,7 @@ function CopyPasteCorrectString(str) ...@@ -2258,7 +2258,7 @@ function CopyPasteCorrectString(str)
res = res.replace(/'/g,'''); res = res.replace(/'/g,''');
res = res.replace(/"/g,'"'); res = res.replace(/"/g,'"');
return res; return res;
}; }
function Body_Paste(api, e) function Body_Paste(api, e)
{ {
var oWordControl = api.WordControl; var oWordControl = api.WordControl;
...@@ -2428,7 +2428,7 @@ function Editor_Paste_Exec(api, pastebin, nodeDisplay, onlyBinary) ...@@ -2428,7 +2428,7 @@ function Editor_Paste_Exec(api, pastebin, nodeDisplay, onlyBinary)
{ {
var oPasteProcessor = new PasteProcessor(api, true, true, false); var oPasteProcessor = new PasteProcessor(api, true, true, false);
oPasteProcessor.Start(pastebin, nodeDisplay, null, onlyBinary); oPasteProcessor.Start(pastebin, nodeDisplay, null, onlyBinary);
}; }
function trimString( str ){ function trimString( str ){
return str.replace(/^\s+|\s+$/g, '') ; return str.replace(/^\s+|\s+$/g, '') ;
}; };
......
...@@ -5487,21 +5487,10 @@ var PASTE_EMPTY_COUNTER = 0; ...@@ -5487,21 +5487,10 @@ var PASTE_EMPTY_COUNTER = 0;
var PASTE_EMPTY_USE = AscBrowser.isMozilla; var PASTE_EMPTY_USE = AscBrowser.isMozilla;
function CopyPasteCorrectString(str)
{
var res = str;
res = res.replace(/&/g,'&');
res = res.replace(/</g,'&lt;');
res = res.replace(/>/g,'&gt;');
res = res.replace(/'/g,'&apos;');
res = res.replace(/"/g,'&quot;');
return res;
};
if (window.USER_AGENT_SAFARI_MACOS) if (window.USER_AGENT_SAFARI_MACOS)
{ {
var PASTE_ELEMENT_ID2 = "clipboard-helper"; PASTE_ELEMENT_ID2 = "clipboard-helper";
var ELEMENT_DISPAY_STYLE2 = "block"; ELEMENT_DISPAY_STYLE2 = "block";
} }
function SafariIntervalFocus2() function SafariIntervalFocus2()
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment