Merge branch 'master' of https://github.com/OpenRefine/OpenRefine into work

README.txt

@@ -1,37 +1,27 @@
-
-
-
                                 O p e n R e f i n e
                                 -------------------
 
 
-
-What is this?
--------------
-
- is a power tool that allows you to load data, understand it,
+OpenRefine is a power tool that allows you to load data, understand it,
 clean it up, reconcile it internally, and augment it with data coming from
 Freebase or other web sources. All with the comfort and privacy of 
 your own computer.
 
 
-
 Where can I get more information on ?
 ----------------------------------------------
 
 Look at the  web site
 
-  http://code.google.com/p/google-refine/
-
+  http://github.com/OpenRefine/OpenRefine
 
 
 Licensing and legal issues
 --------------------------
 
- is open source software and is licensed under the BSD license
+OpenRefine is open source software and is licensed under the BSD license
 located in the LICENSE.txt. See that file also for information on open source
-libraries that  depends on.
-
+libraries that OpenRefine depends on.
 
 
 Credits

extensions/freebase/module/scripts/dialogs/extend-data-preview-dialog.js

@@ -146,13 +146,12 @@ ExtendDataPreviewDialog.prototype._show = function(properties) {
   }
 
   this._elmts.addPropertyInput.suggestP(suggestConfig).bind("fb-select", function(evt, data) {
-    var expected = data.expected_type;
     self._addProperty({
       id : data.id,
       name: data.name,
       expected: {
-        id: expected.id,
-        name: expected.name
+        id: "/type/object",
+        name: "Object"
       }
     });
   });

main/webapp/modules/core/scripts/views/data-table/cell-ui.js

@@ -326,14 +326,17 @@ DataTableCellUI.prototype._searchForMatch = function(suggestOptions) {
   var match = null;
   var commit = function() {
     if (match !== null) {
-      alert(JSON.stringify(match));
+      var notable_types = null;
+      if (match.notable) {
+        notable_types = $.map(match.notable, function(elmt) {
+          return typeof elmt == "string" ? elmt : elmt.id; 
+        }).join(",");
+      }
       var params = {
         judgment: "matched",
         id: match.id,
         name: match.name,
-        types: $.map(match.notable, function(elmt) {
-          return typeof elmt == "string" ? elmt : elmt.id; 
-        }).join(",")
+        types: notable_types
       };
 
       if (elmts.radioSimilar[0].checked) {
@@ -373,7 +376,9 @@ DataTableCellUI.prototype._searchForMatch = function(suggestOptions) {
   elmts.clearButton.click(commitClear);
   elmts.cancelButton.click(dismiss);
 
-  var suggestOptions2 = $.extend({ align: "left" }, suggestOptions || { all_types: true });
+  var suggestOptions2 = $.extend({ align: "left" }, suggestOptions 
+                          || { all_types: true, // FIXME: all_types isn't documented for Suggest.  Is it still implemented?
+                               filter: "(not type:/common/document)" }); // blacklist documents
   if (suggestOptions2.service_url) {
     // Old style suggest API
     suggestOptions2.key = null;

main/webapp/modules/core/scripts/views/data-table/data-table-view.js

@@ -146,7 +146,7 @@ DataTableView.prototype._renderSortingControls = function(sortingControls) {
   $('<a href="javascript:{}"></a>')
   .addClass("action")
   .text("Sort ")
-  .append($('<img>').attr("src", "/images/down-arrow.png"))
+  .append($('<img>').attr("src", "../images/down-arrow.png"))
   .appendTo(sortingControls)
   .click(function() {
     self._createSortingMenu(this);
@@ -230,7 +230,7 @@ DataTableView.prototype._renderDataTables = function(table, headerTable) {
         } else {
           for (var k = 0; k < keys.length; k++) {
             if (c == keys[k]) {
-              $('<img />').attr("src", "images/down-arrow.png").appendTo(td);
+              $('<img />').attr("src", "../images/down-arrow.png").appendTo(td);
               break;
             }
           }

main/webapp/modules/core/styles/common.less

@@ -162,7 +162,7 @@ a img {
   }
   
 .button-menu, a.button-menu {
-  background: url(images/down-arrow.png) no-repeat right 6px;
+  background: url(../images/down-arrow.png) no-repeat right 6px;
   padding-right: 12px;
   }