Macintosh-SW
/
tenfourfox
mirror of https://github.com/classilla/tenfourfox.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

#164: fix static variables for anonymous methods ; implement plaintext of <<tab>>

This commit is contained in:
Cameron Kaiser 2019-02-12 21:25:32 -08:00
parent 4881c0af02
commit 72cddaa366
2 changed files with 43 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
browser/app/macbuild/Contents/Resources/scripting.sdef.in
View File

@ -302,10 +302,10 @@
<property name="URL" code="pURL" type="text" access="rw" description="The current URL of the tab.">
<cocoa key="URL"/>
</property>
<property name="source" code="pSrc" type="text" access="r" description="The HTML source of the web page currently loaded in the tab.">
<property name="HTML" code="pHTM" type="text" access="r" description="The HTML source of the web page currently loaded in the tab.">
<cocoa key="source"/>
</property>
<property name="text" code="pTxt" type="text" access="r" description="The text of the web page currently loaded in the tab. Modifications to text aren&apos;t reflected on the web page.">
<property name="plaintext" code="pTxt" type="text" access="r" description="The text of the web page currently loaded in the tab. Modifications to text aren&apos;t reflected on the web page.">
<cocoa key="text"/>
</property>
<property name="selected" code="pSTx" type="text" access="r" description="The selected text on the web page currently loaded in the tab.">

58
toolkit/components/applescript/src/MacScripting.mm
View File

@ -107,8 +107,6 @@ typedef unsigned int NSUInteger;
struct objc_method remoMeth;
struct objc_method openMeth;
struct objc_method_list methodList;
BOOL didInit;
NSUInteger openExpected;
}
+ (GeckoScriptingRoot*)sharedScriptingRoot;
@ -208,6 +206,8 @@ void SetupMacScripting(void) {
#pragma mark -
static GeckoScriptingRoot *sharedScriptingRoot = nil;
static NSUInteger openExpected = 1; // we always start with a window
static BOOL didInit = NO;
@implementation GeckoScriptingRoot
@ -222,9 +222,6 @@ static GeckoScriptingRoot *sharedScriptingRoot = nil;
- (id)init {
self = [super init];
if (self)
didInit = NO;
openExpected = 0;
return self;
}
@ -277,6 +274,7 @@ static GeckoScriptingRoot *sharedScriptingRoot = nil;
class_addMethods([application class], &methodList);
didInit = YES;
openExpected = 1;
}
- (NSArray*)scriptWindows {
@ -676,12 +674,8 @@ static GeckoScriptingRoot *sharedScriptingRoot = nil;
nsCOMPtr<nsIDocument> pdoc = piWindow->GetDoc();
if (!pdoc)
return @"";
nsCOMPtr<nsIPresShell> p = pdoc->GetShell();
if (!p)
return @"";
nsIDocument* doc = p->GetDocument();
if (doc) {
nsCOMPtr<nsIDOMHTMLDocument> htmlDocument(do_QueryInterface(doc));
if (pdoc) {
nsCOMPtr<nsIDOMHTMLDocument> htmlDocument(do_QueryInterface(pdoc));
if (htmlDocument) {
nsAutoString title;
if (NS_SUCCEEDED(htmlDocument->GetTitle(title))) {
@ -763,24 +757,54 @@ static GeckoScriptingRoot *sharedScriptingRoot = nil;
- (NSString*)source {
#if(0)
nsCOMPtr<nsIDOMDocument> document;
if (NS_SUCCEEDED(mContentWindow->GetDocument(getter_AddRefs(document))) && document) {
NS_WARNING("AppleScript: tab title");
nsCOMPtr<nsPIDOMWindow> piWindow = do_QueryInterface(mContentWindow);
if (!piWindow)
return @"";
nsCOMPtr<nsIDocument> pdoc = piWindow->GetDoc();
if (pdoc) {
nsCOMPtr<nsIDOMSerializer> serializer(do_CreateInstance(NS_XMLSERIALIZER_CONTRACTID));
if (serializer) {
nsAutoString source;
if (NS_SUCCEEDED(serializer->SerializeToString(document, source))) {
if (NS_SUCCEEDED(serializer->SerializeToString(pdoc, source))) {
return [NSString stringWithUTF8String:NS_ConvertUTF16toUTF8(source).get()];
}
}
}
#endif
return @"";
#endif
}
- (NSString*)text {
NS_WARNING("AppleScript: tab text");
nsresult rv;
nsCOMPtr<nsPIDOMWindow> piWindow = do_QueryInterface(mContentWindow);
if (!piWindow)
return @"";
nsCOMPtr<nsIDocument> pdoc = piWindow->GetDoc();
if (!pdoc)
return @"";
nsCOMPtr<nsIDOMDocument> domdoc = do_QueryInterface(pdoc);
if (!domdoc)
return @"";
nsAutoString outbuf;
nsCOMPtr<nsIDocumentEncoder> encoder = do_CreateInstance(
"@mozilla.org/layout/documentEncoder;1?type=text/plain");
rv = encoder->Init(domdoc, NS_LITERAL_STRING("text/plain"), 0 |
nsIDocumentEncoder::SkipInvisibleContent |
nsIDocumentEncoder::OutputFormatted |
nsIDocumentEncoder::OutputLFLineBreak |
nsIDocumentEncoder::OutputFormatFlowed |
0);
if (NS_FAILED(rv))
return @"";
if (NS_SUCCEEDED(encoder->EncodeToString(outbuf))) {
return [NSString stringWithUTF8String:NS_ConvertUTF16toUTF8(outbuf).get()];
}
#if(0)
nsCOMPtr<nsIDOMDocument> document;
if (NS_SUCCEEDED(mContentWindow->GetDocument(getter_AddRefs(document))) && document) {
if (pdoc) {
nsresult rv = NS_OK;
nsCAutoString formatType(NS_DOC_ENCODER_CONTRACTID_BASE);