Skip to content

Commit

Permalink
Merge pull request sakaiproject#755 from mcarropellicer/SAK-29598
Browse files Browse the repository at this point in the history
SAK-29598 - Add more templates to CK Editor
  • Loading branch information
ottenhoff committed Jul 29, 2015
2 parents 4404a0e + 4555a84 commit 7b97a5d
Show file tree
Hide file tree
Showing 8 changed files with 51 additions and 5 deletions.
14 changes: 9 additions & 5 deletions reference/library/src/webapp/editor/ckeditor.launch.js
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,11 @@ sakai.editor.editors = sakai.editor.editors || {};
sakai.editor.enableResourceSearch = false;

sakai.editor.editors.ckeditor = {};

//get path of directory ckeditor
var basePath = CKEDITOR.basePath;
basePath = basePath.substr(0, basePath.indexOf("ckeditor/"))+"ckextraplugins/";

// Please note that no more parameters should be added to this signature.
// The config object allows for name-based config options to be passed.
// The w and h parameters should be removed as soon as their uses can be migrated.
Expand Down Expand Up @@ -117,7 +122,10 @@ sakai.editor.editors.ckeditor.launch = function(targetId, config, w, h) {
//SAK-23418
pasteFromWordRemoveFontStyles : false,
pasteFromWordRemoveStyles : false,
autosave_saveDetectionSelectors : "input[id*='save'],input[name*='save'],input[name*='cancel'],input[id*='cancel']"
autosave_saveDetectionSelectors : "input[id*='save'],input[name*='save'],input[name*='cancel'],input[id*='cancel']",
//SAK-29598 - Add more templates to CK Editor
templates_files: [basePath+"templates/default.js"],
templates: 'customtemplates'
};

//NOTE: The height and width properties are handled discretely here.
Expand Down Expand Up @@ -167,10 +175,6 @@ sakai.editor.editors.ckeditor.launch = function(targetId, config, w, h) {
}
}

//get path of directory ckeditor
//
var basePath = CKEDITOR.basePath;
basePath = basePath.substr(0, basePath.indexOf("ckeditor/"))+"ckextraplugins/";
//To add extra plugins outside the plugins directory, add them here! (And in the variable)
(function() {
CKEDITOR.plugins.addExternal('movieplayer',basePath+'movieplayer/', 'plugin.js');
Expand Down

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

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 7b97a5d

Please sign in to comment.