Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge branch 'master' into Item14288
  • Loading branch information
MichaelDaum committed Mar 24, 2017
2 parents b1d18e0 + 0d5df86 commit 419c2f5
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 7 deletions.
Expand Up @@ -77,7 +77,7 @@ FoswikiTiny.init = function(init) {
// Supply an image_list for the image plugin that calls
// back to the server for content - Item14323
init.image_list = function(callback) {
return tinymce.activeEditor.plugins.foswiki.image_list(callback);
return tinymce.activeEditor.plugins.foswiki.getImageList(callback);
};

tinymce.init(init);
Expand Down
Expand Up @@ -490,15 +490,16 @@
// The REST call gives us a list of Foswiki meta-data
// Convert to TMCE-speak
var ml = [];
for (var i in list)
for (var i in list) {
// Expand simple attachment name into a pub
// reference
var url = makeAttachmentURL(list[i].attachment);
ml.push({
url: url,
value: url,
text: list[i].attachment
});
ml.push({
url: url,
value: url,
text: list[i].attachment
});
}
callback(ml);
});
},
Expand Down

0 comments on commit 419c2f5

Please sign in to comment.