diff --git a/browser/base/content/browser-social.js b/browser/base/content/browser-social.js
index fac49738e0b4..ce1feba9c4a5 100644
--- a/browser/base/content/browser-social.js
+++ b/browser/base/content/browser-social.js
@@ -639,17 +639,17 @@ SocialShare = {
}
this.sharePage(providerOrigin, pageData, target, anchor);
});
- gBrowser.selectedBrowser.messageManager.sendAsyncMessage("PageMetadata:GetPageData", null, { target });
+ gBrowser.selectedBrowser.messageManager.sendAsyncMessage("PageMetadata:GetPageData");
return;
}
- // if this is a share of a selected item, get any microformats
- if (!pageData.microformats && target) {
- messageManager.addMessageListener("PageMetadata:MicroformatsResult", _dataFn = (msg) => {
- messageManager.removeMessageListener("PageMetadata:MicroformatsResult", _dataFn);
- pageData.microformats = msg.data;
+ // if this is a share of a selected item, get any microdata
+ if (!pageData.microdata && target) {
+ messageManager.addMessageListener("PageMetadata:MicrodataResult", _dataFn = (msg) => {
+ messageManager.removeMessageListener("PageMetadata:MicrodataResult", _dataFn);
+ pageData.microdata = msg.data;
this.sharePage(providerOrigin, pageData, target, anchor);
});
- gBrowser.selectedBrowser.messageManager.sendAsyncMessage("PageMetadata:GetMicroformats", null, { target });
+ gBrowser.selectedBrowser.messageManager.sendAsyncMessage("PageMetadata:GetMicrodata", null, { target });
return;
}
this.currentShare = pageData;
diff --git a/browser/base/content/content.js b/browser/base/content/content.js
index 13c8a369ab53..74d8a1db8d81 100644
--- a/browser/base/content/content.js
+++ b/browser/base/content/content.js
@@ -715,20 +715,20 @@ addEventListener("pageshow", function(event) {
var PageMetadataMessenger = {
init() {
addMessageListener("PageMetadata:GetPageData", this);
- addMessageListener("PageMetadata:GetMicroformats", this);
+ addMessageListener("PageMetadata:GetMicrodata", this);
},
receiveMessage(message) {
switch(message.name) {
case "PageMetadata:GetPageData": {
- let target = message.objects.target;
- let result = PageMetadata.getData(content.document, target);
+ let result = PageMetadata.getData(content.document);
sendAsyncMessage("PageMetadata:PageDataResult", result);
break;
}
- case "PageMetadata:GetMicroformats": {
+
+ case "PageMetadata:GetMicrodata": {
let target = message.objects.target;
- let result = PageMetadata.getMicroformats(content.document, target);
- sendAsyncMessage("PageMetadata:MicroformatsResult", result);
+ let result = PageMetadata.getMicrodata(content.document, target);
+ sendAsyncMessage("PageMetadata:MicrodataResult", result);
break;
}
}
diff --git a/browser/base/content/socialmarks.xml b/browser/base/content/socialmarks.xml
index 1c7fede9e0fc..72acca48cb6a 100644
--- a/browser/base/content/socialmarks.xml
+++ b/browser/base/content/socialmarks.xml
@@ -164,17 +164,17 @@
messageManager.removeMessageListener("PageMetadata:PageDataResult", _dataFn);
this.loadPanel(msg.json, target);
});
- gBrowser.selectedBrowser.messageManager.sendAsyncMessage("PageMetadata:GetPageData", null, { target });
+ gBrowser.selectedBrowser.messageManager.sendAsyncMessage("PageMetadata:GetPageData");
return;
}
- // if this is a share of a selected item, get any microformats
- if (!pageData.microformats && target) {
- messageManager.addMessageListener("PageMetadata:MicroformatsResult", _dataFn = (msg) => {
- messageManager.removeMessageListener("PageMetadata:MicroformatsResult", _dataFn);
- pageData.microformats = msg.data;
+ // if this is a share of a selected item, get any microdata
+ if (!pageData.microdata && target) {
+ messageManager.addMessageListener("PageMetadata:MicrodataResult", _dataFn = (msg) => {
+ messageManager.removeMessageListener("PageMetadata:MicrodataResult", _dataFn);
+ pageData.microdata = msg.data;
this.loadPanel(pageData, target);
});
- gBrowser.selectedBrowser.messageManager.sendAsyncMessage("PageMetadata:GetMicroformats", null, { target });
+ gBrowser.selectedBrowser.messageManager.sendAsyncMessage("PageMetadata:GetMicrodata", null, { target });
return;
}
this.pageData = pageData;
diff --git a/browser/base/content/test/social/browser.ini b/browser/base/content/test/social/browser.ini
index 7179b354cc69..0bd7f871bad0 100644
--- a/browser/base/content/test/social/browser.ini
+++ b/browser/base/content/test/social/browser.ini
@@ -9,7 +9,7 @@ support-files =
opengraph/shortlink_linkrel.html
opengraph/shorturl_link.html
opengraph/shorturl_linkrel.html
- microformats.html
+ microdata.html
share.html
share_activate.html
social_activate.html
diff --git a/browser/base/content/test/social/browser_share.js b/browser/base/content/test/social/browser_share.js
index 2e0570d7bcfa..cac637d6a6c5 100644
--- a/browser/base/content/test/social/browser_share.js
+++ b/browser/base/content/test/social/browser_share.js
@@ -205,53 +205,53 @@ var tests = {
port.postMessage({topic: "test-init"});
executeSoon(runOneTest);
},
- testShareMicroformats: function(next) {
+ testShareMicrodata: function(next) {
SocialService.addProvider(manifest, function(provider) {
let port = provider.getWorkerPort();
let target, testTab;
let expecting = JSON.stringify({
- "url": "https://example.com/browser/browser/base/content/test/social/microformats.html",
- "title": "Raspberry Pi Page",
- "previews": ["https://example.com/someimage.jpg"],
- "microformats": {
+ "url": "https://example.com/browser/browser/base/content/test/social/microdata.html",
+ "title": "My Blog",
+ "previews": [],
+ "microdata": {
"items": [{
- "type": ["h-product"],
+ "types": ["http://schema.org/BlogPosting"],
"properties": {
- "name": ["Raspberry Pi"],
- "photo": ["https://example.com/someimage.jpg"],
- "description": [{
- "value": "The Raspberry Pi is a credit-card sized computer that plugs into your TV and a keyboard. It's a capable little PC which can be used for many of the things that your desktop PC does, like spreadsheets, word-processing and games. It also plays high-definition video. We want to see it being used by kids all over the world to learn programming.",
- "html": "The Raspberry Pi is a credit-card sized computer that plugs into your TV and a keyboard. It's a capable little PC which can be used for many of the things that your desktop PC does, like spreadsheets, word-processing and games. It also plays high-definition video. We want to see it being used by kids all over the world to learn programming."
- }
- ],
- "url": ["https://example.com/"],
- "price": ["29.95"],
- "review": [{
- "value": "4.5 out of 5",
- "type": ["h-review"],
+ "headline": ["Progress report"],
+ "datePublished": ["2013-08-29"],
+ "url": ["https://example.com/browser/browser/base/content/test/social/microdata.html?comments=0"],
+ "comment": [{
+ "types": ["http://schema.org/UserComments"],
"properties": {
- "rating": ["4.5"]
+ "url": ["https://example.com/browser/browser/base/content/test/social/microdata.html#c1"],
+ "creator": [{
+ "types": ["http://schema.org/Person"],
+ "properties": {
+ "name": ["Greg"]
+ }
+ }
+ ],
+ "commentTime": ["2013-08-29"]
+ }
+ }, {
+ "types": ["http://schema.org/UserComments"],
+ "properties": {
+ "url": ["https://example.com/browser/browser/base/content/test/social/microdata.html#c2"],
+ "creator": [{
+ "types": ["http://schema.org/Person"],
+ "properties": {
+ "name": ["Charlotte"]
+ }
+ }
+ ],
+ "commentTime": ["2013-08-29"]
}
}
- ],
- "category": ["Computer", "Education"]
+ ]
}
}
- ],
- "rels": {
- "tag": ["https://example.com/wiki/computer", "https://example.com/wiki/education"]
- },
- "rel-urls": {
- "https://example.com/wiki/computer": {
- "text": "Computer",
- "rels": ["tag"]
- },
- "https://example.com/wiki/education": {
- "text": "Education",
- "rels": ["tag"]
- }
- }
+ ]
}
});
@@ -259,15 +259,15 @@ var tests = {
let topic = e.data.topic;
switch (topic) {
case "got-share-data-message":
- is(JSON.stringify(e.data.result), expecting, "microformats data ok");
+ is(JSON.stringify(e.data.result), expecting, "microdata data ok");
gBrowser.removeTab(testTab);
SocialService.disableProvider(manifest.origin, next);
break;
}
}
port.postMessage({topic: "test-init"});
-
- let url = "https://example.com/browser/browser/base/content/test/social/microformats.html"
+
+ let url = "https://example.com/browser/browser/base/content/test/social/microdata.html"
addTab(url, function(tab) {
testTab = tab;
let doc = tab.linkedBrowser.contentDocument;
diff --git a/browser/base/content/test/social/browser_social_contextmenu.js b/browser/base/content/test/social/browser_social_contextmenu.js
index 54d6c7dc1bb1..305b6d24b3e3 100644
--- a/browser/base/content/test/social/browser_social_contextmenu.js
+++ b/browser/base/content/test/social/browser_social_contextmenu.js
@@ -27,26 +27,32 @@ function test() {
}
var tests = {
- testMarkMicroformats: function(next) {
+ testMarkMicrodata: function(next) {
// emulates context menu action using target element, calling SocialMarks.markLink
let provider = Social._getProviderFromOrigin(manifest.origin);
let port = provider.getWorkerPort();
let target, testTab;
- // browser_share tests microformats on the full page, this is testing a
+ // browser_share tests microdata on the full page, this is testing a
// specific target element.
let expecting = JSON.stringify({
- "url": "https://example.com/browser/browser/base/content/test/social/microformats.html",
- "microformats": {
+ "url": "https://example.com/browser/browser/base/content/test/social/microdata.html",
+ "microdata": {
"items": [{
- "type": ["h-review"],
+ "types": ["http://schema.org/UserComments"],
"properties": {
- "rating": ["4.5"]
+ "url": ["https://example.com/browser/browser/base/content/test/social/microdata.html#c2"],
+ "creator": [{
+ "types": ["http://schema.org/Person"],
+ "properties": {
+ "name": ["Charlotte"]
+ }
+ }
+ ],
+ "commentTime": ["2013-08-29"]
}
}
- ],
- "rels": {},
- "rel-urls": {}
+ ]
}
});
@@ -54,7 +60,7 @@ var tests = {
let topic = e.data.topic;
switch (topic) {
case "got-share-data-message":
- is(JSON.stringify(e.data.result), expecting, "microformats data ok");
+ is(JSON.stringify(e.data.result), expecting, "microdata data ok");
gBrowser.removeTab(testTab);
port.close();
next();
@@ -63,11 +69,11 @@ var tests = {
}
port.postMessage({topic: "test-init"});
- let url = "https://example.com/browser/browser/base/content/test/social/microformats.html"
+ let url = "https://example.com/browser/browser/base/content/test/social/microdata.html"
addTab(url, function(tab) {
testTab = tab;
let doc = tab.linkedBrowser.contentDocument;
- target = doc.getElementById("test-review");
+ target = doc.getElementById("test-comment");
SocialMarks.markLink(manifest.origin, url, target);
});
}
diff --git a/browser/base/content/test/social/microdata.html b/browser/base/content/test/social/microdata.html
new file mode 100644
index 000000000000..f9222647a169
--- /dev/null
+++ b/browser/base/content/test/social/microdata.html
@@ -0,0 +1,38 @@
+
+
+My Blog
+
+
+
+
+
Progress report
+
+
+
+
All in all, he's doing well with his swim lessons. The biggest thing was he had trouble
+ putting his head in, but we got it down.
+
+
Comments
+
+
+
+
Ha!
+
+
+
+
+
When you say "we got it down"...
+
+
+
+
\ No newline at end of file
diff --git a/browser/base/content/test/social/microformats.html b/browser/base/content/test/social/microformats.html
deleted file mode 100644
index 3f04b61b76ed..000000000000
--- a/browser/base/content/test/social/microformats.html
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
- Raspberry Pi Page
-
-
Raspberry Pi
-
-
The Raspberry Pi is a credit-card sized computer that plugs into your TV and a keyboard. It's a capable little PC which can be used for many of the things that your desktop PC does, like spreadsheets, word-processing and games. It also plays high-definition video. We want to see it being used by kids all over the world to learn programming.
- 
- object.h-x[data] Jane Doe
- .h-x>img[src]:only-of-type:not[.h-*]