Media is now core, two fields rely on it.

edajobs · Jun 12, 2014 · 230887d · 230887d
1 parent 01c86c8
commit 230887d
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -69,6 +69,7 @@ module.exports = function(grunt) {
                     'ReduxCore/assets/js/redux.min.js': ['ReduxCore/assets/js/redux.min.js'],
                     'ReduxCore/assets/js/vendor/select2.sortable.min.js' : ['ReduxCore/assets/js/vendor/select2.sortable.js'],
                     'ReduxCore/assets/js/color-picker/color-picker.min.js': ['ReduxCore/assets/js/color-picker/color-picker.js'],
+                    'ReduxCore/assets/js/media/media.min.js': ['ReduxCore/assets/js/media/media.js'],
                     'ReduxCore/inc/fields/ace_editor/field_ace_editor.min.js': ['ReduxCore/inc/fields/ace_editor/field_ace_editor.js'],
                     'ReduxCore/inc/fields/background/field_background.min.js': ['ReduxCore/inc/fields/background/field_background.js'],
                     'ReduxCore/inc/fields/border/field_border.min.js': ['ReduxCore/inc/fields/border/field_border.js'],
@@ -82,7 +83,6 @@ module.exports = function(grunt) {
                     'ReduxCore/inc/fields/image_select/field_image_select.min.js': ['ReduxCore/inc/fields/image_select/field_image_select.js'],
                     'ReduxCore/inc/fields/import_export/field_import_export.min.js': ['ReduxCore/inc/fields/import_export/field_import_export.js'],
                     'ReduxCore/inc/fields/link_color/field_link_color.min.js': ['ReduxCore/inc/fields/link_color/field_link_color.js'],
-                    'ReduxCore/inc/fields/media/field_media.min.js': ['ReduxCore/inc/fields/media/field_media.js'],
                     'ReduxCore/inc/fields/multi_text/field_multi_text.min.js': ['ReduxCore/inc/fields/multi_text/field_multi_text.js'],
                     'ReduxCore/inc/fields/select/field_select.min.js': ['ReduxCore/inc/fields/select/field_select.js'],
                     'ReduxCore/inc/fields/select_image/field_select_image.min.js': ['ReduxCore/inc/fields/select_image/field_select_image.js'],
@@ -117,6 +117,7 @@ module.exports = function(grunt) {
         jshint: {
             files: [
                  'ReduxCore/assets/js/color-picker/color-picker.js',
+                 'ReduxCore/assets/js/media/media.js',
                  'ReduxCore/inc/fields/ace_editor/field_ace_editor.js',
                  'ReduxCore/inc/fields/background/field_background.js',
                  'ReduxCore/inc/fields/border/field_border.js',
@@ -129,7 +130,6 @@ module.exports = function(grunt) {
                  'ReduxCore/inc/fields/gallery/field_gallery.js',
                  'ReduxCore/inc/fields/image_select/field_image_select.js',
                  'ReduxCore/inc/fields/import_export/field_import_export.js',
-                 'ReduxCore/inc/fields/media/field_media.js',
                  'ReduxCore/inc/fields/multi_text/field_multitext.js',
                  'ReduxCore/inc/fields/select/field_select.js',
                  'ReduxCore/inc/fields/select_image/field_select_image.js',

diff --git a/ReduxCore/inc/fields/media/field_media.js → ReduxCore/assets/js/media/media.js b/ReduxCore/inc/fields/media/field_media.js → ReduxCore/assets/js/media/media.js
diff --git a/...xCore/inc/fields/media/field_media.min.js → ReduxCore/assets/js/media/media.min.js b/...xCore/inc/fields/media/field_media.min.js → ReduxCore/assets/js/media/media.min.js
diff --git a/ReduxCore/inc/fields/media/field_media.php b/ReduxCore/inc/fields/media/field_media.php
@@ -199,8 +199,8 @@ public function enqueue() {
 
                 wp_enqueue_script(
                     'redux-field-media-js',
-                    ReduxFramework::$_url . 'inc/fields/media/field_media' . Redux_Functions::isMin() . '.js',
-                    array( 'jquery', 'wp-color-picker', 'redux-js' ),
+                    ReduxFramework::$_url . 'assets/js/media/media' . Redux_Functions::isMin() . '.js',
+                    array( 'jquery', 'redux-js' ),
                     time(),
                     true
                 );

diff --git a/ReduxCore/inc/fields/slides/field_slides.php b/ReduxCore/inc/fields/slides/field_slides.php
@@ -234,11 +234,11 @@ public function render () {
         public function enqueue () {
 
 
-            wp_enqueue_script (
-                'redux-field-media-js', 
-                ReduxFramework::$_url . 'inc/fields/media/field_media' . Redux_Functions::isMin () . '.js', 
-                array( 'jquery', 'redux-js' ), 
-                time (), 
+            wp_enqueue_script(
+                'redux-field-media-js',
+                ReduxFramework::$_url . 'assets/js/media/media' . Redux_Functions::isMin() . '.js',
+                array( 'jquery', 'redux-js' ),
+                time(),
                 true
             );