Merge pull request #22 from SilverStripers/hotfix/media-embed-fixes

added a new check for the markdown buttons to check dependency module…
HelloBetterLTD · Dec 22, 2017 · a495dac · a495dac
2 parents 16c1aa9 + 4f01b8a
commit a495dac
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 5 deletions.
diff --git a/_config/editorconfig.yml b/_config/editorconfig.yml
@@ -50,11 +50,13 @@ SilverStripers\markdown\forms\MarkdownEditorConfig:
           action: ssEmbed
           className: 'fa fa-play'
           title: 'Embed Media'
+          dependsOn: 'silverstripe/asset-admin'
       -
           name: image
           action: ssImage
           className: 'fa fa-picture-o'
           title: 'Insert Image'
+          dependsOn: 'silverstripe/asset-admin'
       - '|'
       -
           name: preview

diff --git a/client/dist/bundle.min.js b/client/dist/bundle.min.js
diff --git a/client/src/entwine/Markdown_ssembed.js b/client/src/entwine/Markdown_ssembed.js
@@ -5,7 +5,7 @@ import ReactDOM from 'react-dom';
 
 import { ApolloProvider } from 'react-apollo';
 import { provideInjector } from 'lib/Injector';
-const InjectableInsertEmbedModal = provideInjector(window.InsertEmbedModal.default);
+const InjectableInsertEmbedModal = window.InsertEmbedModal ? provideInjector(window.InsertEmbedModal.default) : null;
 
 jQuery.entwine('ss', ($) => {
 
@@ -40,6 +40,9 @@ jQuery.entwine('ss', ($) => {
          * @private
          */
         _renderModal(show) {
+            if(!InjectableInsertEmbedModal) {
+                throw new Error('Embed is not supported, Install silverstripe/asset-admin');
+            }
             const handleHide = () => this.close();
             const handleInsert = (...args) => this._handleInsert(...args);
             const handleCreate = (...args) => this._handleCreate(...args);

diff --git a/client/src/entwine/Markdown_ssmedia.js b/client/src/entwine/Markdown_ssmedia.js
@@ -4,7 +4,7 @@ import ReactDOM from 'react-dom';
 
 import { ApolloProvider } from 'react-apollo';
 import { provideInjector } from 'lib/Injector';
-const InjectableInsertMediaModal = provideInjector(window.InsertMediaModal.default);
+const InjectableInsertMediaModal = window.InsertMediaModal ? provideInjector(window.InsertMediaModal.default) : null;
 
 
 jQuery.entwine('ss', ($) => {
@@ -34,6 +34,9 @@ jQuery.entwine('ss', ($) => {
          * @private
          */
         _renderModal(show) {
+            if(!InjectableInsertMediaModal) {
+                throw new Error('Embed is not supported, Install silverstripe/asset-admin');
+            }
             const handleHide = () => this.close();
             const handleInsert = (...args) => this._handleInsert(...args);
             const store = window.ss.store;

diff --git a/src/forms/MarkdownEditorConfig.php b/src/forms/MarkdownEditorConfig.php
@@ -14,6 +14,7 @@
 use SilverStripe\Core\Config\Configurable;
 use SilverStripe\Core\Convert;
 use SilverStripe\Core\Injector\Injectable;
+use SilverStripe\Core\Manifest\ModuleLoader;
 use SilverStripe\Core\Manifest\ModuleResourceLoader;
 use SilverStripe\View\SSViewer;
 use SilverStripe\View\ThemeResourceLoader;
@@ -178,6 +179,22 @@ public function getEditorCSS()
         return $editor;
     }
 
+    /**
+     * @param $toolbar
+     * @return array
+     */
+    private function checkSettingsDependencies($toolbar)
+    {
+        $moduleLoader = ModuleLoader::inst();
+        $modules = array_keys($moduleLoader->getManifest()->getModules());
+        $approved = [];
+        foreach ($toolbar as $item) {
+            if(empty($item['dependsOn']) || (isset($item['dependsOn']) && in_array($item['dependsOn'], $modules))) {
+                $approved[] = $item;
+            }
+        }
+        return $approved;
+    }
 
     /**
      * @return array
@@ -196,7 +213,7 @@ public function getSettings()
         }
 
         return [
-            'toolbar'       => $toolbar,
+            'toolbar'       => $this->checkSettingsDependencies($toolbar),
             'editor_css'    => $this->getEditorCSS(),
             'identifier'	=> $this->getIdentifier()
         ];