added SSMedia for media files

HelloBetterLTD · Oct 15, 2017 · b1f5137 · b1f5137
1 parent 4fe86c9
commit b1f5137
Show file tree

Hide file tree

Showing 8 changed files with 523 additions and 680 deletions.
diff --git a/client/dist/bundle.min.js b/client/dist/bundle.min.js
diff --git a/client/dist/sourcemaps/bundle.min.css.map b/client/dist/sourcemaps/bundle.min.css.map
diff --git a/client/src/bundles/bundle.js b/client/src/bundles/bundle.js
@@ -1,2 +1,3 @@
-require('../entwine/Markdown_ssembed');
+require('../entwine/Markdown_ssembed')
+require('../entwine/Markdown_ssmedia');
 require('../components/MarkdownEditorField/MarkdownEditorField');
diff --git a/client/src/components/MarkdownEditorField/MarkdownEditorField.js b/client/src/components/MarkdownEditorField/MarkdownEditorField.js
@@ -105,30 +105,20 @@ jQuery.entwine('ss', ($) => {
             },
             {
                 name: "image",
-                //action: SimpleMDE.drawImage,
-
                  action: function(editor) {
-                     /*
                      if(window.InsertMediaModal) {
-                         let dialog = $('#insert-md-embed-react__dialog-wrapper');
-
+                         let dialog = $('#insert-md-media-react__dialog-wrapper');
                          if (!dialog.length) {
-                         dialog = $('<div id="insert-md-embed-react__dialog-wrapper" />');
-                         $('body').append(dialog);
-                         //dialog.dialog({
-                         //    autoOpen: false
-                         // });
+                             dialog = $('<div id="insert-md-media-react__dialog-wrapper" />');
+                             $('body').append(dialog);
                          }
-
-                         console.log(dialog);
-
                          dialog.setElement(editor);
                          dialog.open();
                      }
                      else {
                         SimpleMDE.drawImage(editor);
                      }
-                     */
+
                  },
                 className: "fa fa-picture-o",
                 title: "Insert Image",

diff --git a/client/src/components/MarkdownEditorField/MarkdownEmbedModal.js b/client/src/components/MarkdownEditorField/MarkdownEmbedModal.js
diff --git a/client/src/entwine/Markdown_ssembed.js b/client/src/entwine/Markdown_ssembed.js
@@ -5,9 +5,7 @@ import ReactDOM from 'react-dom';
 
 import { ApolloProvider } from 'react-apollo';
 import { provideInjector } from 'lib/Injector';
-import InsertEmbedModal from '../../../../asset-admin/client/src/components/InsertEmbedModal/InsertEmbedModal';
-
-const InjectableInsertEmbedModal = provideInjector(InsertEmbedModal);
+const InjectableInsertEmbedModal = provideInjector(window.InsertEmbedModal.default);
 
 jQuery.entwine('ss', ($) => {
 
@@ -41,7 +39,7 @@ jQuery.entwine('ss', ($) => {
          * @param {boolean} show
          * @private
          */
-        _renderModal(show) { // alert('test');
+        _renderModal(show) {
             const handleHide = () => this.close();
             const handleInsert = (...args) => this._handleInsert(...args);
             const handleCreate = (...args) => this._handleCreate(...args);
@@ -55,7 +53,6 @@ jQuery.entwine('ss', ($) => {
             <ApolloProvider store={store} client={client}>
                 <InjectableInsertEmbedModal
                     show={show}
-                    type="insert-media"
                     onCreate={handleCreate}
                     onInsert={handleInsert}
                     onHide={handleHide}
@@ -167,9 +164,18 @@ jQuery.entwine('ss', ($) => {
             let pos = $field.codemirror.getCursor();
             $field.codemirror.setSelection(pos, pos);
             $field.codemirror.replaceSelection("\n" + $('<div />').append(base.clone()).html() + "\n");
+            updateTextarea();
             return true;
         },
 
+
+        updateTextarea()
+        {
+            const $field = this.getElement();
+            $($field.element).closest('.js-markdown-holder')
+                .find('textarea.markdowneditor').val($field.value());
+        }
+
     });
 
 });