From 793d739726f132ad8c3daa229e242b85d357b986 Mon Sep 17 00:00:00 2001 From: Harry Bomrah Date: Mon, 25 Mar 2013 18:44:06 +0800 Subject: [PATCH] features and widgets added Conflicts: app/assets/javascripts/orbitdesktop.js --- app/assets/images/icons/envocab.png | Bin 0 -> 8410 bytes app/assets/images/icons/wikibooks.png | Bin 0 -> 8198 bytes app/assets/javascripts/orbitdesktop.js | 219 ++++++++++++++++------ app/assets/javascripts/orbitdesktopAPI.js | 10 +- app/controllers/desktop_controller.rb | 14 +- app/models/desktop/desktop_widget.rb | 3 +- app/models/desktop/tile.rb | 3 +- app/uploaders/image_uploader.rb | 4 +- app/views/desktop/index.html.erb | 2 +- 9 files changed, 193 insertions(+), 62 deletions(-) create mode 100644 app/assets/images/icons/envocab.png create mode 100644 app/assets/images/icons/wikibooks.png diff --git a/app/assets/images/icons/envocab.png b/app/assets/images/icons/envocab.png new file mode 100644 index 0000000000000000000000000000000000000000..32516059686c2fa845ada4bb1d28e20ee878a574 GIT binary patch literal 8410 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 literal 0 HcmV?d00001 diff --git a/app/assets/javascripts/orbitdesktop.js b/app/assets/javascripts/orbitdesktop.js index 75273d61f..f56314834 100755 --- a/app/assets/javascripts/orbitdesktop.js +++ b/app/assets/javascripts/orbitdesktop.js @@ -37,6 +37,71 @@ var sortAscending = function(a, b) { var sortDescending = function(a, b) { return $(a).find("h1").text() < $(b).find("h1").text() ? 1 : -1; }; +jQuery.ajax = (function(_ajax){ + + var protocol = location.protocol, + hostname = location.hostname, + exRegex = RegExp(protocol + '//' + hostname), + YQL = 'http' + (/^https/.test(protocol)?'s':'') + '://query.yahooapis.com/v1/public/yql?callback=?', + query = 'select * from html where url="{URL}" and xpath="*"'; + + function isExternal(url) { + return !exRegex.test(url) && /:\/\//.test(url); + } + + return function(o) { + + var url = o.url; + + if ( /get/i.test(o.type) && !/json/i.test(o.dataType) && isExternal(url) ) { + + // Manipulate options so that JSONP-x request is made to YQL + + o.url = YQL; + o.dataType = 'json'; + + o.data = { + q: query.replace( + '{URL}', + url + (o.data ? + (/\?/.test(url) ? '&' : '?') + jQuery.param(o.data) + : '') + ), + format: 'xml' + }; + + // Since it's a JSONP request + // complete === success + if (!o.success && o.complete) { + o.success = o.complete; + delete o.complete; + } + + o.success = (function(_success){ + return function(data) { + + if (_success) { + // Fake XHR callback. + _success.call(this, { + responseText: (data.results[0] || '') + // YQL screws with