Update CKEditor to version 4.12.1. (oppia#7654)

anamsarfraz · Sep 22, 2019 · a915133 · a915133
1 parent c71cd5b
commit a915133
Show file tree

Hide file tree

Showing 17 changed files with 22 additions and 24 deletions.
diff --git a/core/templates/dev/head/components/ck-editor-helpers/ck-editor-4-rte.directive.ts b/core/templates/dev/head/components/ck-editor-helpers/ck-editor-4-rte.directive.ts
@@ -92,8 +92,8 @@ angular.module('oppia').directive('ckEditor4Rte', [
         // Add external plugins.
         CKEDITOR.plugins.addExternal(
           'sharedspace',
-          '/third_party/static/ckeditor-sharedspace-4.9.2/', 'plugin.js');
-        // Pre plugin is not available for 4.9.2 version of CKEditor. This is
+          '/third_party/static/ckeditor-sharedspace-4.12.1/', 'plugin.js');
+        // Pre plugin is not available for 4.12.1 version of CKEditor. This is
         // a self created plugin (other plugins are provided by CKEditor).
         CKEDITOR.plugins.addExternal(
           'pre', '/extensions/ckeditor_plugins/pre/', 'plugin.js');

diff --git a/core/templates/dev/head/pages/admin-page/admin-page.mainpage.html b/core/templates/dev/head/pages/admin-page/admin-page.mainpage.html
@@ -15,6 +15,6 @@
     <admin-page></admin-page>
 
     @require('../footer_js_libs.html')
-    <script src="/third_party/static/ckeditor-4.9.2/ckeditor.js"></script>
+    <script src="/third_party/static/ckeditor-4.12.1/ckeditor.js"></script>
   </body>
 </html>
diff --git a/core/templates/dev/head/pages/creator-dashboard-page/creator-dashboard-page.mainpage.html b/core/templates/dev/head/pages/creator-dashboard-page/creator-dashboard-page.mainpage.html
@@ -23,7 +23,7 @@
     </div>
 
     @require('../footer_js_libs.html')
-    <script src="/third_party/static/ckeditor-4.9.2/ckeditor.js"></script>
+    <script src="/third_party/static/ckeditor-4.12.1/ckeditor.js"></script>
     <script src="/third_party/static/MathJax-2.7.5/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script>
   </body>
 </html>
diff --git a/core/templates/dev/head/pages/exploration-editor-page/exploration-editor-page.mainpage.html b/core/templates/dev/head/pages/exploration-editor-page/exploration-editor-page.mainpage.html
@@ -119,7 +119,7 @@ <h2>
     </div>
 
     @require('../footer_js_libs.html')
-    <script src="/third_party/static/ckeditor-4.9.2/ckeditor.js"></script>
+    <script src="/third_party/static/ckeditor-4.12.1/ckeditor.js"></script>
     <script src="/third_party/static/MathJax-2.7.5/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script>
     @require('../../../../../../extensions/interactions/dependency_html.html')
   </body>

diff --git a/core/templates/dev/head/pages/exploration-player-page/exploration-player-page.mainpage.html b/core/templates/dev/head/pages/exploration-player-page/exploration-player-page.mainpage.html
@@ -37,7 +37,7 @@
       </base-content>
     </div>
     @require('../footer_js_libs.html')
-    <script src="/third_party/static/ckeditor-4.9.2/ckeditor.js"></script>
+    <script src="/third_party/static/ckeditor-4.12.1/ckeditor.js"></script>
     <script src="/third_party/static/MathJax-2.7.5/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script>
     @require('../../../../../../extensions/interactions/dependency_html.html')
   </body>

diff --git a/core/templates/dev/head/pages/moderator-page/moderator-page.mainpage.html b/core/templates/dev/head/pages/moderator-page/moderator-page.mainpage.html
@@ -26,6 +26,6 @@
     </div>
 
     @require('../footer_js_libs.html')
-    <script src="/third_party/static/ckeditor-4.9.2/ckeditor.js"></script>
+    <script src="/third_party/static/ckeditor-4.12.1/ckeditor.js"></script>
   </body>
 </html>
diff --git a/core/templates/dev/head/pages/practice-session-page/practice-session-page.mainpage.html b/core/templates/dev/head/pages/practice-session-page/practice-session-page.mainpage.html
@@ -24,7 +24,7 @@
       </base-content>
     </div>
     @require('../footer_js_libs.html')
-    <script src="/third_party/static/ckeditor-4.9.2/ckeditor.js"></script>
+    <script src="/third_party/static/ckeditor-4.12.1/ckeditor.js"></script>
     <script src="/third_party/static/MathJax-2.7.5/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script>
   </body>
 </html>
diff --git a/core/templates/dev/head/pages/review-test-page/review-test-page.mainpage.html b/core/templates/dev/head/pages/review-test-page/review-test-page.mainpage.html
@@ -21,7 +21,7 @@
         <page-footer></page-footer>
       </base-content>
     </div>
-    <script src="/third_party/static/ckeditor-4.9.2/ckeditor.js"></script>
+    <script src="/third_party/static/ckeditor-4.12.1/ckeditor.js"></script>
     <script src="/third_party/static/MathJax-2.7.5/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script>
     @require('../footer_js_libs.html')
   </body>

diff --git a/core/templates/dev/head/pages/skill-editor-page/skill-editor-page.mainpage.html b/core/templates/dev/head/pages/skill-editor-page/skill-editor-page.mainpage.html
@@ -26,7 +26,7 @@
     </div>
 
     @require('../footer_js_libs.html')
-    <script src="/third_party/static/ckeditor-4.9.2/ckeditor.js"></script>
+    <script src="/third_party/static/ckeditor-4.12.1/ckeditor.js"></script>
     <script src="/third_party/static/MathJax-2.7.5/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script>
     @require('../../../../../../extensions/interactions/codemirror.html')
   </body>

diff --git a/core/templates/dev/head/pages/story-editor-page/story-editor-page.mainpage.html b/core/templates/dev/head/pages/story-editor-page/story-editor-page.mainpage.html
@@ -27,7 +27,7 @@
     </div>
 
     @require('../footer_js_libs.html')
-    <script src="/third_party/static/ckeditor-4.9.2/ckeditor.js"></script>
+    <script src="/third_party/static/ckeditor-4.12.1/ckeditor.js"></script>
     <script src="/third_party/static/MathJax-2.7.5/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script>
 
   </body>

diff --git a/core/templates/dev/head/pages/topic-editor-page/topic-editor-page.mainpage.html b/core/templates/dev/head/pages/topic-editor-page/topic-editor-page.mainpage.html
@@ -26,7 +26,7 @@
     </div>
 
     @require('../footer_js_libs.html')
-    <script src="/third_party/static/ckeditor-4.9.2/ckeditor.js"></script>
+    <script src="/third_party/static/ckeditor-4.12.1/ckeditor.js"></script>
     <script src="/third_party/static/MathJax-2.7.5/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script>
     @require('../../../../../../extensions/interactions/codemirror.html')
   </body>

diff --git a/...ead/pages/topics-and-skills-dashboard-page/topics-and-skills-dashboard-page.mainpage.html b/...ead/pages/topics-and-skills-dashboard-page/topics-and-skills-dashboard-page.mainpage.html
@@ -24,7 +24,7 @@
       </base-content>
     </div>
 
-    <script src="/third_party/static/ckeditor-4.9.2/ckeditor.js"></script>
+    <script src="/third_party/static/ckeditor-4.12.1/ckeditor.js"></script>
     @require('../footer_js_libs.html')
   </body>
 </html>
diff --git a/core/tests/karma.conf.ts b/core/tests/karma.conf.ts
@@ -24,7 +24,7 @@ module.exports = function(config) {
       'third_party/static/headroom-js-0.9.4/headroom.min.js',
       'third_party/static/headroom-js-0.9.4/angular.headroom.min.js',
       'third_party/static/math-expressions-1.7.0/math-expressions.js',
-      'third_party/static/ckeditor-4.9.2/ckeditor.js',
+      'third_party/static/ckeditor-4.12.1/ckeditor.js',
       generatedJs,
       // Note that unexpected errors occur ("Cannot read property 'num' of
       // undefined" in MusicNotesInput.js) if the order of core/templates/...

diff --git a/manifest.json b/manifest.json
@@ -474,16 +474,16 @@
         }
       },
       "ckeditor": {
-        "version": "4.9.2",
+        "version": "4.12.1",
         "downloadFormat": "zip",
-        "url": "https://download.cksource.com/CKEditor/CKEditor/CKEditor%204.9.2/ckeditor_4.9.2_full.zip",
+        "url": "https://download.cksource.com/CKEditor/CKEditor/CKEditor%204.12.1/ckeditor_4.12.1_full.zip",
         "rootDir": "ckeditor",
         "targetDirPrefix": "ckeditor-"
       },
       "ckeditorSharedspace": {
-        "version": "4.9.2",
+        "version": "4.12.1",
         "downloadFormat": "zip",
-        "url": "https://download.ckeditor.com/sharedspace/releases/sharedspace_4.9.2.zip",
+        "url": "https://download.ckeditor.com/sharedspace/releases/sharedspace_4.12.1.zip",
         "rootDir": "sharedspace",
         "targetDirPrefix": "ckeditor-sharedspace-"
       },

diff --git a/package.json b/package.json
@@ -29,7 +29,7 @@
     "@types/angular": "^1.6.54",
     "@types/angular-animate": "^1.5.10",
     "@types/angular-mocks": "^1.7.0",
-    "@types/ckeditor": "^4.9.2",
+    "@types/ckeditor": "^4.9.8",
     "@types/d3": "^5.7.2",
     "@types/google.visualization": "0.0.48",
     "@types/jasmine": "^3.3.12",

diff --git a/scripts/start.py b/scripts/start.py
@@ -168,8 +168,7 @@ def main(args=None):
                 'INFORMATION',
                 'Setting up a local development server at localhost:%s. '
                 % python_utils.UNICODE(PORT_NUMBER_FOR_GAE_SERVER),
-                'Opening a',
-                'default browser window pointing to this server'])
+                'Opening a default browser window pointing to this server'])
             time.sleep(5)
             background_processes.append(
                 subprocess.Popen([
@@ -180,8 +179,7 @@ def main(args=None):
             'INFORMATION',
             'Setting up a local development server at localhost:%s. '
             % python_utils.UNICODE(PORT_NUMBER_FOR_GAE_SERVER),
-            'Opening a',
-            'default browser window pointing to this server.'])
+            'Opening a default browser window pointing to this server.'])
         time.sleep(5)
         background_processes.append(
             subprocess.Popen([

diff --git a/yarn.lock b/yarn.lock
@@ -215,7 +215,7 @@
   resolved "https://registry.yarnpkg.com/@types/angular/-/angular-1.6.56.tgz#20124077bd44061e018c7283c0bb83f4b00322dd"
   integrity sha512-HxtqilvklZ7i6XOaiP7uIJIrFXEVEhfbSY45nfv2DeBRngncI58Y4ZOUMiUkcT8sqgLL1ablmbfylChUg7A3GA==
 
-"@types/ckeditor@^4.9.2":
+"@types/ckeditor@^4.9.8":
   version "4.9.8"
   resolved "https://registry.yarnpkg.com/@types/ckeditor/-/ckeditor-4.9.8.tgz#2585bfea409c0d9e970d04611fb22726c6a6d219"
   integrity sha512-UM2t8mRul1vT/Al3c1L5elal925YstzcBQHLHk+hVvEoFOUkQKokePnGgD1L7K9n4h3hoPDDwc5jEKeUU3UxMw==