@@ -478,48 +478,59 @@ function attachContentDocument(contentPanel, account, address, type) {
function openAttachPanel(account, address, resource, type, documentHref, target, action) {
var contentPanel;
- if(target == 'main') {
- if(getBrowser().contentDocument.location.href != 'about:blank' &&
- !documentHref.match(/^javascript:/))
- getBrowser().selectedTab = getBrowser().addTab();
+ if(target == 'main' && documentHref.match(/^javascript:/)) {
contentPanel = getBrowser().selectedBrowser;
+ XMPP.enableContentDocument(contentPanel, account, address, type, true);
+
+ contentPanel.contentDocument.location.href = documentHref;
+
+ if(action)
+ action(contentPanel);
} else {
- var conversation = cloneBlueprint('conversation');
- _('conversations').appendChild(conversation);
- _(conversation, {role: 'contact'}).value = XMPP.nickFor(account, address);
- contentPanel = _(conversation, {role: 'chat'});
- conversation.setAttribute('account', account);
- conversation.setAttribute('address', address);
- conversation.setAttribute('resource', resource);
- conversation.setAttribute('type', type);
- conversation.setAttribute('url', documentHref);
- contentPanel.addEventListener(
- 'click', function(event) {
- if(event.target.localName == 'a' &&
- event.target.isDefaultNamespace('http://www.w3.org/1999/xhtml')) {
- event.preventDefault();
- if(event.button == 0)
- getBrowser().loadURI(event.target.getAttribute('href'));
- else if(event.button == 1) {
- getBrowser().selectedTab = getBrowser().addTab(event.target.getAttribute('href'));
+ if(target == 'main') {
+ if(getBrowser().contentDocument.location.href != 'about:blank'
+ && !documentHref.match(/^javascript:/))
+ getBrowser().selectedTab = getBrowser().addTab();
+
+ contentPanel = getBrowser().selectedBrowser;
+ } else {
+ var conversation = cloneBlueprint('conversation');
+ _('conversations').appendChild(conversation);
+ _(conversation, {role: 'contact'}).value = XMPP.nickFor(account, address);
+ contentPanel = _(conversation, {role: 'chat'});
+ conversation.setAttribute('account', account);
+ conversation.setAttribute('address', address);
+ conversation.setAttribute('resource', resource);
+ conversation.setAttribute('type', type);
+ conversation.setAttribute('url', documentHref);
+ contentPanel.addEventListener(
+ 'click', function(event) {
+ if(event.target.localName == 'a' &&
+ event.target.isDefaultNamespace('http://www.w3.org/1999/xhtml')) {
+ event.preventDefault();
+ if(event.button == 0)
+ getBrowser().loadURI(event.target.getAttribute('href'));
+ else if(event.button == 1) {
+ getBrowser().selectedTab = getBrowser().addTab(event.target.getAttribute('href'));
+ }
}
- }
- }, true);
- }
+ }, true);
+ }
- queuePostLoadAction(
- contentPanel, function(document) {
- XMPP.enableContentDocument(contentPanel, account, address, type);
+ queuePostLoadAction(
+ contentPanel, function(document) {
+ XMPP.enableContentDocument(contentPanel, account, address, type);
- if(documentHref == getDefaultAppUrl())
- openedConversation(account, address, type);
+ if(documentHref == getDefaultAppUrl())
+ openedConversation(account, address, type);
- if(action)
- action(contentPanel);
- });
-
- contentPanel.contentDocument.location.href = documentHref;
+ if(action)
+ action(contentPanel);
+ });
+
+ contentPanel.contentDocument.location.href = documentHref;
+ }
return contentPanel;
}
chrome/content/sameplace.js
@@ -1,5 +1,5 @@
Context:
-[TAG 0.2.25
-Massimiliano Mirra <bard [at] hyperstruct [dot] net>**20061016142927]
+[TAG 0.3.1
+Massimiliano Mirra <bard [at] hyperstruct [dot] net>**20061024204539]
dependency.xmpp4moz.context
f622f908b5283b899e8d4efaf52cfbb384f65602
Massimiliano Mirra
bard@hyperstruct.net
http://github.com/bard/sameplace/commit/2c0c6f03b9b89706f6f34df44bc2da60780888ce
2c0c6f03b9b89706f6f34df44bc2da60780888ce
2006-10-24T13:46:12-07:00
2006-10-24T13:46:12-07:00
For javascript: URLs of remote (injected) applications, do not really open a new content panel, instead load it in current browser.
darcs-hash:20061024204612-8cc29-8a1d2dc14c3fc708eaa9e54f1ba809dec0e09d4c.gz
e225aa6d9c8667b94081e0cf58e6da4905e07a36
Massimiliano Mirra
bard@hyperstruct.net