Merge branch 'develop'

Author: ElliottAYoung

Diff for: app/assets/javascripts/ckeditor/config.js

@@ -0,0 +1,22 @@
+CKEDITOR.editorConfig = function( config ) {
+	config.extraPlugins = 'cortex_media_insert';
+
+	config.toolbarGroups = [
+		{ name: 'document', groups: [ 'mode', 'document', 'doctools' ] },
+		{ name: 'clipboard', groups: [ 'clipboard', 'undo' ] },
+		{ name: 'editing', groups: [ 'find', 'selection', 'spellchecker', 'editing' ] },
+		{ name: 'forms', groups: [ 'forms' ] },
+		{ name: 'styles', groups: [ 'styles' ] },
+		{ name: 'colors', groups: [ 'colors' ] },
+		{ name: 'tools', groups: [ 'tools' ] },
+		{ name: 'others', groups: [ 'others' ] },
+		{ name: 'about', groups: [ 'about' ] },
+		'/',
+		{ name: 'basicstyles', groups: [ 'basicstyles', 'cleanup' ] },
+		{ name: 'paragraph', groups: [ 'list', 'indent', 'blocks', 'align', 'bidi', 'paragraph' ] },
+		{ name: 'links', groups: [ 'links' ] },
+		{ name: 'insert', groups: [ 'insert' ] }
+	];
+
+	config.removeButtons = 'Image,Source,Save,NewPage,Preview,Print,Templates,Form,Checkbox,Radio,TextField,Textarea,Select,Button,ImageButton,HiddenField,Flash,ShowBlocks,About';
+};

Diff for: app/assets/javascripts/ckeditor/plugins/cortex_media_insert/icons/media.png

@@ -0,0 +1,34 @@
+(function (global) { 
+  'use strict';
+
+  global.CKEDITOR.plugins.add('cortex_media_insert', {
+    icons: 'media',
+    init: function (editor) {
+      editor.addCommand('insertMedia', {
+        exec: function (editor) {
+          window.MODALS.featured.open();
+
+          global.media_select = {};
+          global.media_select_defer = $.Deferred();
+          global.media_select_defer.promise(global.media_select);
+
+          global.media_select.done(function (media) {
+            window.MODALS.featured.close();
+
+            var mediaTag = editor.document.createElement('media');
+            mediaTag.setAttribute('id', media.id);
+            mediaTag.setText(" " + media.title);
+
+            editor.insertElement(mediaTag);
+          });
+        }
+      });
+
+      editor.ui.addButton('cortexMediaInsert', {
+        label: 'Insert Media',
+        command: 'insertMedia',
+        toolbar: 'insert,0'
+      });
+    }
+  });
+}(this));

Diff for: app/assets/javascripts/ckeditor/plugins/cortex_media_insert/plugin.js

@@ -1 +1,2 @@
 //= require ckeditor/init
+//= require ../ckeditor/config

Diff for: app/assets/javascripts/cortex-field_types-core/application.js

@@ -1,6 +1,5 @@
-%h4
-  = render_label
-  
+= render_label
+
 %p
   Please select 1-2 Categories.
 

Diff for: app/cells/plugins/core/tree/checkboxes.haml

@@ -122,15 +122,15 @@ def style_urls
     if existing_data.empty?
       (metadata[:styles].map { |key, value| [key, asset.url(key)] }).to_h
     else
-      existing_data[:asset][:style_urls]
+      existing_data.deep_symbolize_keys[:asset][:style_urls]
     end
   end
 
   def existing_metadata
     metadata.except!(:existing_data)
 
     unless existing_data.empty?
-      metadata[:path].gsub(":id", existing_data['asset_field_type_id']) if metadata[:path]
+      metadata[:path].gsub!(":id", existing_data['asset_field_type_id']) if metadata[:path]
     end
 
     metadata

Diff for: app/models/asset_field_type.rb

@@ -1,7 +1,7 @@
 module Cortex
   module Plugins
     module Core
-      VERSION = '0.4.8'
+      VERSION = '0.5.0'
     end
   end
 end