Merge branch 'release/2.13'

README.md

@@ -74,7 +74,7 @@ To install this extension manually use the following steps:
 - Press the **Select** button
 
 ### Install the extension in Firefox
-Download the [Firefox OSDS .zip](https://github.com/openlink/structured-data-sniffer/releases/download/v2.12/OSDS_FF.zip)
+Download the [Firefox OSDS .zip](https://github.com/openlink/structured-data-sniffer/releases/download/v2.13/OSDS_FF.zip)
 file and extract the .xpi file.
 
 To install this extension manually in Firefox v28+, use the following steps:

prepare_chrome.sh

@@ -20,7 +20,7 @@ SRC_DIR=$EXT_SRC
 DST_DIR=$EXT_DIRNAME
 
 #copy common files
-for I_DIR in handlers.js html_gen.js options.js panel.js settings.js sniffer.css sniffer.js page_panel.js psniffer.css; do
+for I_DIR in frame.js handlers.js converters.js ttl_gen.js html_gen.js options.js panel.js settings.js sniffer.css sniffer.js page_panel.js psniffer.css; do
   cp -va $SRC_DIR/$I_DIR $DST_DIR/
 done
 

prepare_edge.sh

@@ -0,0 +1,40 @@
+#!/bin/bash
+EXT_DIRNAME=./OSDS_Edge
+EXT_SRC=./src
+
+rm -rf $EXT_DIRNAME
+
+mkdir -pv $EXT_DIRNAME
+
+
+SRC_DIR=./
+DST_DIR=$EXT_DIRNAME
+
+#copy info files
+for I_DIR in AUTHORS COPYING CREDITS; do
+  cp -va $SRC_DIR/$I_DIR $DST_DIR/
+done
+
+
+SRC_DIR=$EXT_SRC
+DST_DIR=$EXT_DIRNAME
+
+#copy common files
+for I_DIR in frame.js handlers.js converters.js ttl_gen.js html_gen.js options.js panel.js settings.js sniffer.css sniffer.js page_panel.js psniffer.css; do
+  cp -va $SRC_DIR/$I_DIR $DST_DIR/
+done
+
+#copy Firefox related files
+for I_DIR in webrequest.js browser.js options.html panel.html page_panel.html; do
+  cp -va $SRC_DIR/$I_DIR $DST_DIR/
+done
+
+cp -va $SRC_DIR/manifest.json.edge $DST_DIR/manifest.json
+cp -va $SRC_DIR/browser_edge.js $DST_DIR/browser.js
+
+
+for I_DIR in images lib; do
+  mkdir -pv $DST_DIR/$I_DIR
+  tar --exclude 'original' -cf - -C $SRC_DIR/$I_DIR .|tar -xf - -C $DST_DIR/$I_DIR
+done
+

prepare_ff_webext.sh

@@ -0,0 +1,40 @@
+#!/bin/bash
+EXT_DIRNAME=./OSDS_FF_WebExt
+EXT_SRC=./src
+
+rm -rf $EXT_DIRNAME
+
+mkdir -pv $EXT_DIRNAME
+
+
+SRC_DIR=./
+DST_DIR=$EXT_DIRNAME
+
+#copy info files
+for I_DIR in AUTHORS COPYING CREDITS; do
+  cp -va $SRC_DIR/$I_DIR $DST_DIR/
+done
+
+
+SRC_DIR=$EXT_SRC
+DST_DIR=$EXT_DIRNAME
+
+#copy common files
+for I_DIR in frame.js handlers.js converters.js ttl_gen.js html_gen.js options.js panel.js settings.js sniffer.css sniffer.js page_panel.js psniffer.css; do
+  cp -va $SRC_DIR/$I_DIR $DST_DIR/
+done
+
+#copy Firefox related files
+for I_DIR in webrequest.js browser.js options.html panel.html page_panel.html; do
+  cp -va $SRC_DIR/$I_DIR $DST_DIR/
+done
+
+cp -va $SRC_DIR/manifest.json.ff $DST_DIR/manifest.json
+cp -va $SRC_DIR/browser_ff_WebExt.js $DST_DIR/browser.js
+
+
+for I_DIR in images lib; do
+  mkdir -pv $DST_DIR/$I_DIR
+  tar --exclude 'original' -cf - -C $SRC_DIR/$I_DIR .|tar -xf - -C $DST_DIR/$I_DIR
+done
+

prepare_firefox.sh

@@ -20,7 +20,7 @@ SRC_DIR=$EXT_SRC
 DST_DIR=$EXT_DIRNAME/data
 
 #copy common files
-for I_DIR in handlers.js html_gen.js options.js panel.js settings.js sniffer.css sniffer.js page_panel.js psniffer.css; do
+for I_DIR in frame.js handlers.js converters.js ttl_gen.js html_gen.js options.js panel.js settings.js sniffer.css sniffer.js page_panel.js psniffer.css; do
   cp -va $SRC_DIR/$I_DIR $DST_DIR/
 done
 

src/Firefox/main.js

@@ -25,8 +25,9 @@ var self = require("sdk/self");
 var tabs = require("sdk/tabs");
 var workers = require("sdk/content/worker");
 var ss = require("sdk/simple-storage");
-var sniff_panel = null;
+const {XMLHttpRequest} = require("sdk/net/xhr");
 
+var sniff_panel = null;
 
 
 var button = ToggleButton({
@@ -100,8 +101,8 @@ function createSniffPanel()
     width: 680,
     height: 600,
     contentURL: "./panel_ff.html", // the same : self.data.url("panel.html"),
-    contentScriptFile: ["./lib/jquery-1.11.3.min.js", 
-   		      "./lib/jquery-migrate-1.2.1.min.js",
+    contentScriptFile: ["./lib/jquery-3.1.0.min.js", 
+   		      "./lib/jquery-migrate-3.0.0.min.js",
    		      "./lib/jquery-ui.min.js",
 		      "./lib/microdatajs/jquery.microdata.js",
 		      "./lib/microdatajs/jquery.microdata.json.js",
@@ -115,6 +116,8 @@ function createSniffPanel()
 		      "./browser_ff.js",
 		      "./settings.js",
 		      "./handlers.js",
+                      "./converters.js",
+                      "./ttl_gen.js",
 		      "./html_gen.js",
 		      "./panel.js"
       		     ],
@@ -168,9 +171,9 @@ function createHandlerPanel(_uri, _type)
   var htab = tabs.open({
         url: "./page_panel_ff.html",
         onReady: function(tab) {
-          tab.attach({
-          contentScriptFile: ["./lib/jquery-1.11.3.min.js", 
-   		      "./lib/jquery-migrate-1.2.1.min.js",
+          tab._handler_worker = tab.attach({
+          contentScriptFile: ["./lib/jquery-3.1.0.min.js", 
+   		      "./lib/jquery-migrate-3.0.0.min.js",
    		      "./lib/jquery-ui.min.js",
 		      "./lib/microdatajs/jquery.microdata.js",
 		      "./lib/microdatajs/jquery.microdata.json.js",
@@ -185,23 +188,50 @@ function createHandlerPanel(_uri, _type)
 		      "./settings.js",
 		      "./page_panel.js",
 		      "./handlers.js",
+                      "./converters.js",
+                      "./ttl_gen.js",
 		      "./html_gen.js"
       		     ],
             contentScriptOptions : { ver: self.version,
                                      url: _uri,
                                      type: _type }
           });
+
+
+          tab._handler_worker.port.on("load_data", function(msg){
+            if (msg.url) {
+
+              var xhr = new XMLHttpRequest();
+
+              xhr.onreadystatechange = function() {
+                if (xhr.readyState == 4) {
+                  if (xhr.status===200)
+                    tab._handler_worker.port.emit("url_data", xhr.responseText);
+                  else
+                    {
+                      tab._handler_worker.port.emit("url_error", "error");
+                    }
+                }
+              }
+              xhr.open ('GET', msg.url, true);
+              xhr.setRequestHeader ('Accept', 'text/plain, */*');
+              xhr.send (null);
+            }
+          });
+
         }
       });
+
+
 }
 
 
 
 
 tabs.on('load', function(tab) {
   var worker = tab.attach({
-      contentScriptFile: ["./lib/jquery-1.11.3.min.js", 
-       			  "./lib/jquery-migrate-1.2.1.min.js",
+      contentScriptFile: ["./lib/jquery-3.1.0.min.js", 
+       			  "./lib/jquery-migrate-3.0.0.min.js",
                           "./lib/jsonld.js", 
                           "./lib/microdatajs/jquery.microdata.js", 
                           "./lib/microdatajs/jquery.microdata.json.js", 
@@ -245,8 +275,8 @@ function createPrefPanel()
     width: 570,
     height: 710,
     contentURL: "./options_ff.html",
-    contentScriptFile: ["./lib/jquery-1.11.3.min.js", 
-   		      "./lib/jquery-migrate-1.2.1.min.js",
+    contentScriptFile: ["./lib/jquery-3.1.0.min.js", 
+   		      "./lib/jquery-migrate-3.0.0.min.js",
    		      "./lib/jquery-ui.min.js",
 		      "./lib/jsuri.js",
 		      "./browser_ff.js",
@@ -285,7 +315,6 @@ function check_XHR(request)
     catch (exc)
     {
     }
-
     return false;
 }
 

src/Firefox/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "2.12",
+  "version": "2.13",
   "id": "osds@openlinksw.com",
   "name": "osds",
   "title": "OpenLink Structured Data Sniffer",

src/browser.js

@@ -19,8 +19,33 @@
  */
 
 var Browser = {
-//    isFirefox:(!navigator.userAgent.match(/khtml/i) && !!navigator.userAgent.match(/Gecko/i)&& !!navigator.userAgent.match(/Firefox/i)),
-//    isWebKit:!!navigator.userAgent.match(/AppleWebKit/),
     isChromeAPI: true,
-    isFirefoxSDK: false
-}
+    isFirefoxSDK: false,
+
+    isChromeWebExt: true,
+    isFirefoxWebExt: false,
+    isEdgeWebExt: false,
+
+    api: null,
+
+    openTab : function(uri, tab_index) {
+      if (Browser.isEdgeWebExt) {
+        if (tab_index!==undefined) 
+          Browser.api.tabs.create({url:uri, index:tab_index+1 });
+        else
+          Browser.api.tabs.getCurrent(
+            function(tab) {
+              if (tab!==undefined)
+                Browser.api.tabs.create({url:uri, index:tab.index+1 });
+              else
+                Browser.api.tabs.create({url:uri});
+            }
+          )
+      }else
+        window.open(uri);
+    }
+}
+
+try {
+  Browser.api = (Browser.isChromeAPI && Browser.isChromeWebExt) ? chrome : browser;
+} catch(e) {}

src/browser_edge.js

@@ -0,0 +1,51 @@
+/*
+ *  This file is part of the OpenLink Structured Data Sniffer
+ *
+ *  Copyright (C) 2015-2016 OpenLink Software
+ *
+ *  This project is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License as published by the
+ *  Free Software Foundation; only version 2 of the License, dated June 1991.
+ *
+ *  This program is distributed in the hope that it will be useful, but
+ *  WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ *  General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ */
+
+var Browser = {
+    isChromeAPI: true,
+    isFirefoxSDK: false,
+
+    isChromeWebExt: false,
+    isFirefoxWebExt: false,
+    isEdgeWebExt: true,
+
+    api: null,
+
+    openTab : function(uri, tab_index) {
+      if (Browser.isEdgeWebExt) {
+        if (tab_index!==undefined) 
+          Browser.api.tabs.create({url:uri, index:tab_index+1 });
+        else
+          Browser.api.tabs.getCurrent(
+            function(tab) {
+              if (tab!==undefined)
+                Browser.api.tabs.create({url:uri, index:tab.index+1 });
+              else
+                Browser.api.tabs.create({url:uri});
+            }
+          )
+      }else
+        window.open(uri);
+    }
+}
+
+try {
+  Browser.api = (Browser.isChromeAPI && Browser.isChromeWebExt) ? chrome : browser;
+} catch(e) {}

src/browser_ff.js

@@ -19,8 +19,33 @@
  */
 
 var Browser = {
-//    isFirefox:(!navigator.userAgent.match(/khtml/i) && !!navigator.userAgent.match(/Gecko/i)&& !!navigator.userAgent.match(/Firefox/i)),
-//    isWebKit:!!navigator.userAgent.match(/AppleWebKit/),
     isChromeAPI: false,
-    isFirefoxSDK: true
-}
+    isFirefoxSDK: true,
+
+    isChromeWebExt: false,
+    isFirefoxWebExt: false,
+    isEdgeWebExt: false,
+
+    api: null,
+
+    openTab : function(uri, tab_index) {
+      if (Browser.isEdgeWebExt) {
+        if (tab_index!==undefined) 
+          Browser.api.tabs.create({url:uri, index:tab_index+1 });
+        else
+          Browser.api.tabs.getCurrent(
+            function(tab) {
+              if (tab!==undefined)
+                Browser.api.tabs.create({url:uri, index:tab.index+1 });
+              else
+                Browser.api.tabs.create({url:uri});
+            }
+          )
+      }else
+        window.open(uri);
+    }
+}
+
+try {
+  Browser.api = (Browser.isChromeAPI && Browser.isChromeWebExt) ? chrome : browser;
+} catch(e) {}