Skip to content

Commit

Permalink
Merge pull request #11 from Panopto/2017120500-release-candidate
Browse files Browse the repository at this point in the history 
2017120500 release candidate code
  • Loading branch information
@jmalmsten-panopto
jmalmsten-panopto authored Dec 7, 2017
2 parents ff3a58f + e89c918 commit 1fa4e67
Show file tree
Hide file tree
Showing 6 changed files with 73 additions and 34 deletions.
2 changes: 1 addition & 1 deletion version.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
defined('MOODLE_INTERNAL') || die();

// The current plugin version (Date: YYYYMMDDXX).
$plugin->version = 2017012500;
$plugin->version = 2017120500;

// Requires this Moodle version - 2.7.
$plugin->requires = 2014051200;
Expand Down
4 changes: 2 additions & 2 deletions yui/build/moodle-atto_panoptobutton-button/moodle-atto_panoptobutton-button-coverage.js
View file

Large diffs are not rendered by default.

33 changes: 23 additions & 10 deletions yui/build/moodle-atto_panoptobutton-button/moodle-atto_panoptobutton-button-debug.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ var COMPONENTNAME = 'atto_panoptobutton',
servername = '',
courseid = '',
idstring = '',
playlistString = '?playlistsEnabled=true'
IFSOURCE = servername + '/Panopto/Pages/Sessions/EmbeddedUpload.aspx',
IFHEIGHT = 550,
IFWIDTH = 1060,
Expand Down Expand Up @@ -71,7 +72,7 @@ var COMPONENTNAME = 'atto_panoptobutton',
courseid = this.get('coursecontext');

if (courseid) {
idstring = '?folderID=' + courseid;
idstring = '&folderID=' + courseid;
}

// Set name of button icon to be loaded.
Expand Down Expand Up @@ -164,12 +165,12 @@ var COMPONENTNAME = 'atto_panoptobutton',
aservername = this.get('servename');
if (aservername) {
document.getElementById('pageframe').src = 'https://' + aservername +
'/Panopto/Pages/Sessions/EmbeddedUpload.aspx' + idstring;
'/Panopto/Pages/Sessions/EmbeddedUpload.aspx' + playlistString + idstring;

servername = aservername;
} else {
document.getElementById('pageframe').src = 'https://' + defaultserver +
'/Panopto/Pages/Sessions/EmbeddedUpload.aspx' + idstring;
'/Panopto/Pages/Sessions/EmbeddedUpload.aspx' + playlistString + idstring;

servername = defaultserver;
}
Expand All @@ -194,7 +195,7 @@ var COMPONENTNAME = 'atto_panoptobutton',
CSS: CSS,
component: COMPONENTNAME,
clickedicon: clickedicon,
isource: IFSOURCE + idstring,
isource: IFSOURCE + playlistString + idstring,
iframeheight: IFHEIGHT,
iframeID: IFID,
submitid: SUBMITID,
Expand Down Expand Up @@ -238,38 +239,50 @@ var COMPONENTNAME = 'atto_panoptobutton',
var message,
objectstring,
thumbnailChunk,
idChunk,
ids,
names,
PLAYLIST_EMBED_ID = 1,
VIDEO_EMBED_ID = 0,
i;
if (!eventfired) {
message = JSON.parse(e.data);
objectstring = '';


// Called when "Insert" is clicked. Creates HTML for embedding each selected video into the editor.
if (message.cmd === 'deliveryList') {

ids = message.ids;
names = message.names;

for (i = 0; i < ids.length; ++i) {
thumbnailChunk = "<div style='position: absolute; z-index: -1;'>";



if (message.playableObjectTypes && (parseInt(message.playableObjectTypes[i]) === PLAYLIST_EMBED_ID)){
idChunk = "?pid=" + ids[i];
} else {
idChunk = "?id=" + ids[i];
}

if (typeof names[i] !== 'undefined') {
thumbnailChunk += "<div width='450'><a style='max-width: 450px; display: inline-block;" +
"text-overflow: ellipsis; white-space: nowrap; overflow: hidden;'" +
"href='https://" + servername + '/Panopto/Pages/Viewer.aspx?id=' + ids[i] +
"href='https://" + servername + '/Panopto/Pages/Viewer.aspx' + idChunk +
"' target='_blank'>" + names[i] + "</a></div>";
}

thumbnailChunk += "<a href='https://" + servername + '/Panopto/Pages/Viewer.aspx?id=' +
ids[i] + "' target='_blank'>" +
thumbnailChunk += "<a href='https://" + servername + '/Panopto/Pages/Viewer.aspx' +
idChunk + "' target='_blank'>" +
"<img width='128' height='72' src='https://" + servername + '/Panopto/PublicAPI/SessionPreviewImage?id=' +
ids[i] + "'></img></a><br></div>";

objectstring += "<div style='position: relative;'>" +
thumbnailChunk +
"<div>" + "<object data='https://" + servername + '/Panopto/Pages/Embed.aspx?id=' +
ids[i] +
"&v=1' width='450' height='300' frameborder='0'></object><br></div>" +
"<div>" + "<iframe src='https://" + servername + '/Panopto/Pages/Embed.aspx' +
idChunk + "&v=1' width='450' height='300' frameborder='0'></iframe><br></div>" +
"</div>";
}

Expand Down
2 changes: 1 addition & 1 deletion yui/build/moodle-atto_panoptobutton-button/moodle-atto_panoptobutton-button-min.js
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

33 changes: 23 additions & 10 deletions yui/build/moodle-atto_panoptobutton-button/moodle-atto_panoptobutton-button.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ var COMPONENTNAME = 'atto_panoptobutton',
servername = '',
courseid = '',
idstring = '',
playlistString = '?playlistsEnabled=true'
IFSOURCE = servername + '/Panopto/Pages/Sessions/EmbeddedUpload.aspx',
IFHEIGHT = 550,
IFWIDTH = 1060,
Expand Down Expand Up @@ -71,7 +72,7 @@ var COMPONENTNAME = 'atto_panoptobutton',
courseid = this.get('coursecontext');

if (courseid) {
idstring = '?folderID=' + courseid;
idstring = '&folderID=' + courseid;
}

// Set name of button icon to be loaded.
Expand Down Expand Up @@ -164,12 +165,12 @@ var COMPONENTNAME = 'atto_panoptobutton',
aservername = this.get('servename');
if (aservername) {
document.getElementById('pageframe').src = 'https://' + aservername +
'/Panopto/Pages/Sessions/EmbeddedUpload.aspx' + idstring;
'/Panopto/Pages/Sessions/EmbeddedUpload.aspx' + playlistString + idstring;

servername = aservername;
} else {
document.getElementById('pageframe').src = 'https://' + defaultserver +
'/Panopto/Pages/Sessions/EmbeddedUpload.aspx' + idstring;
'/Panopto/Pages/Sessions/EmbeddedUpload.aspx' + playlistString + idstring;

servername = defaultserver;
}
Expand All @@ -194,7 +195,7 @@ var COMPONENTNAME = 'atto_panoptobutton',
CSS: CSS,
component: COMPONENTNAME,
clickedicon: clickedicon,
isource: IFSOURCE + idstring,
isource: IFSOURCE + playlistString + idstring,
iframeheight: IFHEIGHT,
iframeID: IFID,
submitid: SUBMITID,
Expand Down Expand Up @@ -238,38 +239,50 @@ var COMPONENTNAME = 'atto_panoptobutton',
var message,
objectstring,
thumbnailChunk,
idChunk,
ids,
names,
PLAYLIST_EMBED_ID = 1,
VIDEO_EMBED_ID = 0,
i;
if (!eventfired) {
message = JSON.parse(e.data);
objectstring = '';


// Called when "Insert" is clicked. Creates HTML for embedding each selected video into the editor.
if (message.cmd === 'deliveryList') {

ids = message.ids;
names = message.names;

for (i = 0; i < ids.length; ++i) {
thumbnailChunk = "<div style='position: absolute; z-index: -1;'>";



if (message.playableObjectTypes && (parseInt(message.playableObjectTypes[i]) === PLAYLIST_EMBED_ID)){
idChunk = "?pid=" + ids[i];
} else {
idChunk = "?id=" + ids[i];
}

if (typeof names[i] !== 'undefined') {
thumbnailChunk += "<div width='450'><a style='max-width: 450px; display: inline-block;" +
"text-overflow: ellipsis; white-space: nowrap; overflow: hidden;'" +
"href='https://" + servername + '/Panopto/Pages/Viewer.aspx?id=' + ids[i] +
"href='https://" + servername + '/Panopto/Pages/Viewer.aspx' + idChunk +
"' target='_blank'>" + names[i] + "</a></div>";
}

thumbnailChunk += "<a href='https://" + servername + '/Panopto/Pages/Viewer.aspx?id=' +
ids[i] + "' target='_blank'>" +
thumbnailChunk += "<a href='https://" + servername + '/Panopto/Pages/Viewer.aspx' +
idChunk + "' target='_blank'>" +
"<img width='128' height='72' src='https://" + servername + '/Panopto/PublicAPI/SessionPreviewImage?id=' +
ids[i] + "'></img></a><br></div>";

objectstring += "<div style='position: relative;'>" +
thumbnailChunk +
"<div>" + "<object data='https://" + servername + '/Panopto/Pages/Embed.aspx?id=' +
ids[i] +
"&v=1' width='450' height='300' frameborder='0'></object><br></div>" +
"<div>" + "<iframe src='https://" + servername + '/Panopto/Pages/Embed.aspx' +
idChunk + "&v=1' width='450' height='300' frameborder='0'></iframe><br></div>" +
"</div>";
}

Expand Down
Loading

0 comments on commit 1fa4e67

Please sign in to comment.