ylqjgm
/
canvas-lms
mirror of https://github.com/instructure/canvas-lms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

allow multple rce on the same page to launch resource selection 

test plan:
 - Add an editor button tool
 - Create a quiz
 - Add something from the LTI tool to the main RCE
 - Without refreshing create a quiz question, and add LTI content to it
 - Both RCEs should have LTI content

fixes PLAT-698

Change-Id: Ie12f6d405fd321c059ea86fd5c9d4ea3483121f2
Reviewed-on: https://gerrit.instructure.com/46636
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Nathan Mills <nathanm@instructure.com>
QA-Review: August Thornton <august@instructure.com>
Product-Review: Brad Humphrey <brad@instructure.com>
This commit is contained in:
Brad Humphrey 2015-01-06 16:54:53 -07:00
parent 8442169d80
commit 206e66d8f8
2 changed files with 58 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
public/javascripts/instructure_helper.js
View File

@ -56,7 +56,6 @@ define([
window.external_tool_dialog = {
ready: function(data) {
$("#external_tool_button_dialog:visible").triggerHandler('selection', data);
$("#resource_selection_dialog:visible").triggerHandler('selection', data);
$("#homework_selection_dialog:visible").triggerHandler('selection', data);
},

115
public/javascripts/tinymce/jscripts/tiny_mce/plugins/instructure_external_tools/editor_plugin.js vendored
View File

@ -77,64 +77,65 @@ define([
.appendTo("body");
});
})
.bind('selection', function(event, data) {
var editor = $dialog.data('editor') || ed;
if(data.return_type == 'lti_launch_url') {
if($("#external_tool_retrieve_url").attr('href')) {
var external_url = $.replaceTags($("#external_tool_retrieve_url").attr('href'), 'url', data.url);
$("#" + ed.id).editorBox('create_link', {
url: external_url,
title: data.title,
text: data.text
});
} else {
console.log("cannot embed basic lti links in this context");
}
} else if(data.return_type == 'image_url') {
var html = $("<div/>").append($("<img/>", {
src: data.url,
alt: data.alt
}).css({
width: data.width,
height: data.height
})).html();
$("#" + ed.id).editorBox('insert_code', html);
} else if(data.return_type == 'url') {
$("#" + ed.id).editorBox('create_link', {
url: data.url,
title: data.title,
text: data.text,
target: data.target == '_blank' ? '_blank' : null
});
} else if(data.return_type == 'file') {
$("#" + ed.id).editorBox('create_link', {
url: data.url,
title: data.filename,
text: data.filename
});
} else if(data.return_type == 'iframe') {
var html = $("<div/>").append($("<iframe/>", {
src: data.url,
title: data.title,
allowfullscreen: "true",
webkitallowfullscreen: "true",
mozallowfullscreen: "true"
}).css({
width: data.width,
height: data.height
})).html();
$("#" + ed.id).editorBox('insert_code', html);
} else if(data.return_type == 'rich_content') {
$("#" + ed.id).editorBox('insert_code', data.html);
} else if(data.return_type == 'error' && data.message) {
alert(data.message);
} else {
console.log("unrecognized embed type: " + data.return_type);
}
$("#external_tool_button_dialog iframe").attr('src', 'about:blank');
$("#external_tool_button_dialog").dialog('close');
});
}
$(window).unbind("externalContentReady");
$(window).bind("externalContentReady", function(event, data){
var editor = $dialog.data('editor') || ed;
if(data.return_type == 'lti_launch_url') {
if($("#external_tool_retrieve_url").attr('href')) {
var external_url = $.replaceTags($("#external_tool_retrieve_url").attr('href'), 'url', data.url);
$("#" + ed.id).editorBox('create_link', {
url: external_url,
title: data.title,
text: data.text
});
} else {
console.log("cannot embed basic lti links in this context");
}
} else if(data.return_type == 'image_url') {
var html = $("<div/>").append($("<img/>", {
src: data.url,
alt: data.alt
}).css({
width: data.width,
height: data.height
})).html();
$("#" + editor.id).editorBox('insert_code', html);
} else if(data.return_type == 'url') {
$("#" + editor.id).editorBox('create_link', {
url: data.url,
title: data.title,
text: data.text,
target: data.target == '_blank' ? '_blank' : null
});
} else if(data.return_type == 'file') {
$("#" + editor.id).editorBox('create_link', {
url: data.url,
title: data.filename,
text: data.filename
});
} else if(data.return_type == 'iframe') {
var html = $("<div/>").append($("<iframe/>", {
src: data.url,
title: data.title,
allowfullscreen: "true",
webkitallowfullscreen: "true",
mozallowfullscreen: "true"
}).css({
width: data.width,
height: data.height
})).html();
$("#" + editor.id).editorBox('insert_code', html);
} else if(data.return_type == 'rich_content') {
$("#" + editor.id).editorBox('insert_code', data.html);
} else if(data.return_type == 'error' && data.message) {
alert(data.message);
} else {
console.log("unrecognized embed type: " + data.return_type);
}
$dialog.find('iframe').attr('src', 'about:blank');
$dialog.dialog('close')
});
$dialog.dialog('option', 'title', 'Embed content from ' + button.name);
$dialog.dialog('close')
.dialog('option', 'width', button.width || 800)