Merge branch 'develop'

Author: toastercup

app/assets/javascripts/ckeditor/plugins/cortex_media_insert/plugin.js

@@ -49,14 +49,16 @@
 
       editor.addCommand('insertMedia', {
         exec: function (editor) {
-          window.MODALS.wysiwyg.open();
+          global.blur_backdrop();
+          global.dialogs.wysiwyg.showModal();
 
           global.media_select = {};
           global.media_select_defer = $.Deferred();
           global.media_select_defer.promise(global.media_select);
 
           global.media_select.done(function (media) {
-            window.MODALS.wysiwyg.close();
+            global.unblur_backdrop();
+            global.dialogs.wysiwyg.close();
 
             editor.execCommand('media', {
               startupData: {

app/assets/javascripts/cortex-plugins-core/cells/content_item.js

@@ -1,19 +1,30 @@
-$('.media-select--featured').click(function (elem) {
-  var id = $(this).data().id;
-  var title = $(this).data().title;
-  var thumb_url = $(this).data().thumb;
+(function (global) {
+  'use strict';
 
-  $(".association_content_item_id").val(id);
+  $("#featured-button__select").on("click", function (event) {
+    event.preventDefault();
+    global.blur_backdrop();
+    global.dialogs.featured.showModal();
+  });
 
-  $('.content-item-button__selection').remove();
-  $('.content-item-button').append(
-    '<div class="content-item-button__selection">' +
-    '<img src="' + thumb_url + '" height="50px">' +
-    '<div class="content-item-button__selection__text">' +
-    'Selected Media: ' +
-    title +
-    '</div></div>'
-  );
+  $('.media-select--featured').click(function (elem) {
+    var id = $(this).data().id;
+    var title = $(this).data().title;
+    var thumb_url = $(this).data().thumb;
 
-  window.MODALS.featured.close();
-});
+    $(".association_content_item_id").val(id);
+
+    $('.content-item-button__selection').remove();
+    $('.content-item-button').append(
+      '<div class="content-item-button__selection">' +
+      '<img src="' + thumb_url + '" height="50px">' +
+      '<div class="content-item-button__selection__text">' +
+      'Selected Media: ' +
+      title +
+      '</div></div>'
+    );
+
+    global.unblur_backdrop();
+    global.dialogs.featured.close();
+  });
+}(this));

app/assets/javascripts/cortex-plugins-core/cells/text.js

@@ -0,0 +1,15 @@
+(function (global) {
+  'use strict';
+
+  $('.media-select--wysiwyg').on("click", function (event) {
+    event.preventDefault();
+    var element = $(this),
+      id = element.data().id,
+      title = element.data().title,
+      url = element.data().url,
+      alt = element.data().alt,
+      asset_type = element.data().assetType;
+
+    media_select_defer.resolve({id: id, title: title, url: url, alt: alt, asset_type: asset_type});
+  });
+}(this));

app/cells/plugins/core/content_item/popup.haml

@@ -3,7 +3,7 @@
 
 = render_label
 %br
-%button.content-item-button.popup--open
+%button.content-item-button#featured-button__select
   .content-item-button__select.content-item-button__select--selected
     %i{ class: "material-icons icon" }
       cloud_upload

lib/cortex/plugins/core/version.rb

@@ -1,7 +1,7 @@
 module Cortex
   module Plugins
     module Core
-      VERSION = '0.9.1'
+      VERSION = '0.10.0'
     end
   end
 end