mozilla
/
pjs
зеркало из https://github.com/mozilla/pjs.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 466599 - wrap HTML on system pasteboard to provide charset metadata, fixes paste/drag into rich-text NSTextView destinations; r=(joshmoz + roc) sr=roc

This commit is contained in:
Jonathan Kew 2009-01-01 15:26:16 +01:00
Родитель a1fb92a898
Коммит 5da560a3b6
5 изменённых файлов: 133 добавлений и 5 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

1
widget/src/cocoa/nsClipboard.h
Просмотреть файл

@ -61,6 +61,7 @@ public:
// Helper methods, used also by nsDragService
static NSDictionary* PasteboardDictFromTransferable(nsITransferable *aTransferable);
static PRBool IsStringType(const nsCString& aMIMEType, const NSString** aPasteboardType);
static NSString* WrapHtmlForSystemPasteboard(NSString* aString);
protected:

26
widget/src/cocoa/nsClipboard.mm
Просмотреть файл

@ -115,13 +115,16 @@ nsClipboard::SetNativeClipboardData(PRInt32 aWhichClipboard)
NSString* currentKey = [outputKeys objectAtIndex:i];
id currentValue = [pasteboardOutputDict valueForKey:currentKey];
if (currentKey == NSStringPboardType ||
currentKey == NSHTMLPboardType ||
currentKey == kCorePboardType_url ||
currentKey == kCorePboardType_urld ||
currentKey == kCorePboardType_urln)
currentKey == kCorePboardType_urln) {
[generalPBoard setString:currentValue forType:currentKey];
else
} else if (currentKey == NSHTMLPboardType) {
[generalPBoard setString:(nsClipboard::WrapHtmlForSystemPasteboard(currentValue))
forType:currentKey];
} else {
[generalPBoard setData:currentValue forType:currentKey];
}
}
mChangeCount = [generalPBoard changeCount];
@ -539,6 +542,7 @@ nsClipboard::PasteboardDictFromTransferable(nsITransferable* aTransferable)
NS_OBJC_END_TRY_ABORT_BLOCK_NIL;
}
PRBool nsClipboard::IsStringType(const nsCString& aMIMEType, const NSString** aPasteboardType)
{
if (aMIMEType.EqualsLiteral(kUnicodeMime) ||
@ -552,3 +556,19 @@ PRBool nsClipboard::IsStringType(const nsCString& aMIMEType, const NSString** aP
return PR_FALSE;
}
}
NSString* nsClipboard::WrapHtmlForSystemPasteboard(NSString* aString)
{
NSString* wrapped =
[NSString stringWithFormat:
@"<html>"
"<head>"
"<meta http-equiv=\"content-type\" content=\"text/html; charset=utf-8\">"
"</head>"
"<body>"
"%@"
"</body>"
"</html>", aString];
return wrapped;
}

5
widget/src/cocoa/nsDragService.mm
Просмотреть файл

@ -138,12 +138,15 @@ static nsresult SetUpDragClipboard(nsISupportsArray* aTransferableArray)
NSString* currentKey = [types objectAtIndex:i];
id currentValue = [pasteboardOutputDict valueForKey:currentKey];
if (currentKey == NSStringPboardType ||
currentKey == NSHTMLPboardType ||
currentKey == kCorePboardType_url ||
currentKey == kCorePboardType_urld ||
currentKey == kCorePboardType_urln) {
[dragPBoard setString:currentValue forType:currentKey];
}
else if (currentKey == NSHTMLPboardType) {
[dragPBoard setString:(nsClipboard::WrapHtmlForSystemPasteboard(currentValue))
forType:currentKey];
}
else if (currentKey == NSTIFFPboardType) {
[dragPBoard setData:currentValue forType:currentKey];
}

4
widget/tests/Makefile.in
Просмотреть файл

@ -52,7 +52,9 @@ _TEST_FILES = test_bug343416.xul \
ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa)
_TEST_FILES += native_menus_window.xul \
test_native_menus.xul \
test_bug428405.xul
test_bug428405.xul \
test_bug466599.xul \
$(NULL)
endif
libs:: $(_TEST_FILES)

102
widget/tests/test_bug466599.xul Normal file
Просмотреть файл

@ -0,0 +1,102 @@
<?xml version="1.0"?>
<?xml-stylesheet type="text/css" href="chrome://global/skin"?>
<?xml-stylesheet type="text/css" href="/tests/SimpleTest/test.css"?>
<!--
https://bugzilla.mozilla.org/show_bug.cgi?id=466599
-->
<window title="Mozilla Bug 466599"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
onload="initAndRunTests()">
<script type="application/javascript"
src="chrome://mochikit/content/MochiKit/packed.js"/>
<script type="application/javascript"
src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"/>
<!-- test results are displayed in the html:body -->
<body xmlns="http://www.w3.org/1999/xhtml">
<p id="display"></p>
<div id="content" style="display: none"></div>
<pre id="test"></pre>
</body>
<!-- test code goes here -->
<script class="testbody" type="application/javascript">
<![CDATA[
/** Test for Bug 466599 **/
function copyToClipboard(txt)
{
var clipid = Components.interfaces.nsIClipboard;
var clip =
Components.classes['@mozilla.org/widget/clipboard;1'].createInstance(clipid);
if (!clip)
return false;
var trans =
Components.classes['@mozilla.org/widget/transferable;1'].createInstance(Components.interfaces.nsITransferable);
if (!trans)
return false;
trans.addDataFlavor('text/html');
var str =
Components.classes['@mozilla.org/supports-string;1'].createInstance(Components.interfaces.nsISupportsString);
var copytext = txt;
str.data = copytext;
trans.setTransferData("text/html",str,copytext.length*2);
if (!clip)
return false;
clip.setData(trans,null,clipid.kGlobalClipboard);
return true;
}
function readFromClipboard()
{
var clipid = Components.interfaces.nsIClipboard;
var clip =
Components.classes['@mozilla.org/widget/clipboard;1'].createInstance(clipid);
if (!clip)
return;
var trans =
Components.classes['@mozilla.org/widget/transferable;1'].createInstance(Components.interfaces.nsITransferable);
if (!trans)
return;
trans.addDataFlavor('text/html');
clip.getData(trans,clipid.kGlobalClipboard);
var str = new Object();
var strLength = new Object();
trans.getTransferData("text/html",str,strLength);
if (str)
str = str.value.QueryInterface(Components.interfaces.nsISupportsString);
if (str)
pastetext = str.data.substring(0,strLength.value / 2);
return pastetext;
}
function encodeHtmlEntities(s)
{
var result = '';
for (var i = 0; i < s.length; i++) {
var c = s.charAt(i);
result += {'<':'&lt;', '>':'&gt;', '&':'&amp;', '"':'&quot;'}[c] || c;
}
return result;
}
function initAndRunTests()
{
var source = '<p>Lorem ipsum</p>';
var expect = new RegExp('<html>.*charset=utf-8.*' + source + '.*</html>', 'im');
var result = copyToClipboard(source);
ok(result, "copied HTML data to system pasteboard");
result = readFromClipboard();
ok(expect.test(result), "data on system pasteboard is wrapped with charset metadata");
$("display").innerHTML =
'<em>source:</em> <pre>' + encodeHtmlEntities(source) + '</pre><br/>' +
'<em>result:</em> <pre>' + encodeHtmlEntities(result) + '</pre>';
}
]]>
</script>
</window>