Skip to content

Commit

Permalink
SAK-41843 - CKEditor: Replace movieplayer plugin (Flash) by an HTML5 …
Browse files Browse the repository at this point in the history
…alternative (sakaiproject#8061)
  • Loading branch information
Miguel Pellicer authored Mar 23, 2020
1 parent 563578d commit 3d18639
Show file tree
Hide file tree
Showing 15 changed files with 13 additions and 675 deletions.
9 changes: 8 additions & 1 deletion library/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<bootstrap-version>3.3.7</bootstrap-version>
<font-awesome-version>4.7.0</font-awesome-version>
<!-- Default extra plugins enabled -->
<ckeditor-extra-plugins>sakaipreview,image2,audiorecorder,contentitem,movieplayer,wordcount,notification,autosave,bt_table</ckeditor-extra-plugins>
<ckeditor-extra-plugins>sakaipreview,image2,audiorecorder,contentitem,html5video,wordcount,notification,autosave,bt_table</ckeditor-extra-plugins>
<!-- Empty defaults for a11y-->
<ckeditor-a11y-extra-plugins></ckeditor-a11y-extra-plugins>
<!-- These should only be updated when the webjars version is updated -->
Expand All @@ -27,6 +27,7 @@
<ckeditor.a11ychecker.version>1.1.1</ckeditor.a11ychecker.version>
<ckeditor.balloonpanel.version>4.9.2</ckeditor.balloonpanel.version>
<ckeditor.image2.version>4.14.0</ckeditor.image2.version>
<ckeditor.html5video.version>1.2.1</ckeditor.html5video.version>
</properties>
<dependencies>
<dependency>
Expand Down Expand Up @@ -92,6 +93,12 @@
<version>${ckeditor.image2.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.webjars.bower</groupId>
<artifactId>github-com-bahriddin-ckeditor-html5-video</artifactId>
<version>${ckeditor.html5video.version}</version>
<scope>runtime</scope>
</dependency>
<!--Used in Resources, drag&drop resources -->
<dependency>
<groupId>org.webjars</groupId>
Expand Down
10 changes: 5 additions & 5 deletions library/src/webapp-filtered/editor/ckeditor.launch.js
Original file line number Diff line number Diff line change
Expand Up @@ -171,12 +171,12 @@ sakai.editor.editors.ckeditor.launch = function(targetId, config, w, h) {
['Link','Unlink','Anchor'],
(sakai.editor.enableResourceSearch
? ( sakai.editor.contentItemUrl
? ['ContentItem', 'AudioRecorder','ResourceSearch', 'Image','Movie','Table','HorizontalRule','Smiley','SpecialChar']
: ['AudioRecorder','ResourceSearch', 'Image','Movie','Table','HorizontalRule','Smiley','SpecialChar']
? ['ContentItem', 'AudioRecorder','ResourceSearch', 'Image','Html5video','Table','HorizontalRule','Smiley','SpecialChar']
: ['AudioRecorder','ResourceSearch', 'Image','Html5video','Table','HorizontalRule','Smiley','SpecialChar']
)
: ( sakai.editor.contentItemUrl
? ['ContentItem', 'AudioRecorder', 'Image','Movie','Table','HorizontalRule','Smiley','SpecialChar']
: ['AudioRecorder', 'Image','Movie','Table','HorizontalRule','Smiley','SpecialChar']
? ['ContentItem', 'AudioRecorder', 'Image','Html5video','Table','HorizontalRule','Smiley','SpecialChar']
: ['AudioRecorder', 'Image','Html5video','Table','HorizontalRule','Smiley','SpecialChar']
)
),
'/',
Expand Down Expand Up @@ -250,7 +250,7 @@ sakai.editor.editors.ckeditor.launch = function(targetId, config, w, h) {
CKEDITOR.plugins.addExternal('lineutils',basePath+'lineutils/', 'plugin.js');
CKEDITOR.plugins.addExternal('widget',basePath+'widget/', 'plugin.js');
CKEDITOR.plugins.addExternal('iframedialog',basePath+'iframedialog/', 'plugin.js');
CKEDITOR.plugins.addExternal('movieplayer',basePath+'movieplayer/', 'plugin.js');
CKEDITOR.plugins.addExternal('html5video',webJars+'github-com-bahriddin-ckeditor-html5-video/${ckeditor.html5video.version}/html5video/', 'plugin.js');
CKEDITOR.plugins.addExternal('audiorecorder',basePath+'audiorecorder/', 'plugin.js');
CKEDITOR.plugins.addExternal('contentitem',basePath+'contentitem/', 'plugin.js');
CKEDITOR.plugins.addExternal('sakaipreview',basePath+'sakaipreview/', 'plugin.js');
Expand Down
17 changes: 0 additions & 17 deletions library/src/webapp/editor/ckextraplugins/movieplayer/LICENSE.TXT

This file was deleted.

Binary file not shown.
Binary file not shown.

This file was deleted.

Binary file not shown.
Binary file not shown.
Binary file not shown.
25 changes: 0 additions & 25 deletions library/src/webapp/editor/ckextraplugins/movieplayer/lang/en.js

This file was deleted.

30 changes: 0 additions & 30 deletions library/src/webapp/editor/ckextraplugins/movieplayer/lang/pt.js

This file was deleted.

This file was deleted.

Loading

0 comments on commit 3d18639

Please sign in to comment.