Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/ResourceConstants.java =================================================================== diff -u -re64e0e3ca5c8b2f090ffc15cb9c8346f0cbe2ca4 -rd3f5671d2d2b0e388e0f212fd6a3fd82c072644e --- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/ResourceConstants.java (.../ResourceConstants.java) (revision e64e0e3ca5c8b2f090ffc15cb9c8346f0cbe2ca4) +++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/ResourceConstants.java (.../ResourceConstants.java) (revision d3f5671d2d2b0e388e0f212fd6a3fd82c072644e) @@ -78,8 +78,6 @@ public static final String ATTR_RESOURCE_REVIEW_URL = "resourceItemReviewUrl"; - public static final String ATTR_ENCODED_RESOURCE_REVIEW_URL = "encodedResourceItemReviewUrl"; - public static final String ATTR_IS_DOWNLOAD = "isDownload"; public static final String ATTR_RESOURCE = "resource"; Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/controller/ViewItemController.java =================================================================== diff -u -re64e0e3ca5c8b2f090ffc15cb9c8346f0cbe2ca4 -rd3f5671d2d2b0e388e0f212fd6a3fd82c072644e --- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/controller/ViewItemController.java (.../ViewItemController.java) (revision e64e0e3ca5c8b2f090ffc15cb9c8346f0cbe2ca4) +++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/controller/ViewItemController.java (.../ViewItemController.java) (revision d3f5671d2d2b0e388e0f212fd6a3fd82c072644e) @@ -129,10 +129,6 @@ String reviewUrl = getReviewUrl(item, sessionMapID); request.setAttribute(ResourceConstants.ATTR_RESOURCE_REVIEW_URL, reviewUrl); - if (item.getType() == ResourceConstants.RESOURCE_TYPE_URL) { - request.setAttribute(ResourceConstants.ATTR_ENCODED_RESOURCE_REVIEW_URL, - URLEncoder.encode(reviewUrl, "UTF-8")); - } request.setAttribute(ResourceConstants.ATTR_IS_DOWNLOAD, item.getType() == ResourceConstants.RESOURCE_TYPE_FILE); request.setAttribute(ResourceConstants.ATTR_RESOURCE_INSTRUCTION, item.getInstructions()); Index: lams_tool_larsrc/web/pages/itemreview/itemContent.jsp =================================================================== diff -u -ra7db44d7f5035ee4e4208645ee36d730f1328a92 -rd3f5671d2d2b0e388e0f212fd6a3fd82c072644e --- lams_tool_larsrc/web/pages/itemreview/itemContent.jsp (.../itemContent.jsp) (revision a7db44d7f5035ee4e4208645ee36d730f1328a92) +++ lams_tool_larsrc/web/pages/itemreview/itemContent.jsp (.../itemContent.jsp) (revision d3f5671d2d2b0e388e0f212fd6a3fd82c072644e) @@ -43,21 +43,18 @@ } $('#embedded-open-button', panel).removeClass('hidden'); - - - $.ajax({ - url: "http://ckeditor.iframe.ly/api/oembed?url=${encodedResourceItemReviewUrl}", - dataType: "jsonp", - cache: true, - type: "POST", - jsonpCallback: 'iframelyCallback${itemUid}', - contentType: "application/json; charset=utf-8", - error: function (xhr, status, error) { - $('.embedded-open-button', panel).removeClass('btn-default btn-sm pull-right').addClass('btn-primary'); - console.log("Result: " + status + " " + error + " " + xhr.status + " " + xhr.statusText) - } - }); - + $.ajax({ + url: "http://ckeditor.iframe.ly/api/oembed?url=" + encodeURIComponent("${resourceItemReviewUrl}"), + dataType: "jsonp", + cache: true, + type: "POST", + jsonpCallback: 'iframelyCallback${itemUid}', + contentType: "application/json; charset=utf-8", + error: function (xhr, status, error) { + $('.embedded-open-button', panel).removeClass('btn-default btn-sm pull-right').addClass('btn-primary'); + console.log("Result: " + status + " " + error + " " + xhr.status + " " + xhr.statusText) + } + }); }); function iframelyCallback${itemUid}(response) { @@ -94,7 +91,7 @@ -

+