This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/drupal-org-release.make b/drupal-org-release.make | |
| index 55d99a4..550e2bb 100644 | |
| --- a/drupal-org-release.make | |
| +++ b/drupal-org-release.make | |
| @@ -17,6 +17,7 @@ projects[panopoly_magic][subdir] = panopoly | |
| projects[panopoly_widgets][version] = 1.25 | |
| projects[panopoly_widgets][subdir] = panopoly | |
| +projects[panopoly_widgets][patch][] = "https://gist.githubusercontent.com/junaidpv/548678046def41325c28/raw/d9ddcf904610ec794e765c7e0d0f552934eed3b8/apply_patch_to_media_wysiwyg.patch" | |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/media_browser_plus.module b/media_browser_plus.module | |
| index 9feab9c..607c80b 100644 | |
| --- a/media_browser_plus.module | |
| +++ b/media_browser_plus.module | |
| @@ -834,9 +834,10 @@ function media_browser_plus_form_file_entity_add_upload_alter(&$form, &$form_sta | |
| 'vocabulary' => 'media_folders', | |
| 'parent' => 0, | |
| ); | |
| + $field_folder_info = field_info_field('field_folder'); | |
| $form['field_folder'][LANGUAGE_NONE] = array( |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/modules/media_wysiwyg/includes/media_wysiwyg.file_usage.inc b/modules/media_wysiwyg/includes/media_wysiwyg.file_usage.inc | |
| index cbc1e84..77611d4 100644 | |
| --- a/modules/media_wysiwyg/includes/media_wysiwyg.file_usage.inc | |
| +++ b/modules/media_wysiwyg/includes/media_wysiwyg.file_usage.inc | |
| @@ -12,7 +12,7 @@ | |
| * is heavy-handed, and should be replaced when Drupal's filter system is | |
| * context-aware. | |
| */ | |
| -function media_wysiwyg_field_attach_insert($entity_type, $entity) { | |
| +function media_wysiwyg_entity_insert($entity, $entity_type) { |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/views.module b/views.module | |
| index f46564c..ac70d40 100644 | |
| --- a/views.module | |
| +++ b/views.module | |
| @@ -1807,7 +1807,7 @@ function views_form($form, &$form_state, $view, $output) { | |
| $form = array(); | |
| $query = drupal_get_query_parameters($_GET, array('q')); | |
| - $form['#action'] = url($view->get_url(), array('query' => $query)); | |
| + $form['#action'] = url(request_path(), array('query' => $query)); |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/quickedit.module b/quickedit.module | |
| index 6c9ee5c..c8a29b9 100644 | |
| --- a/quickedit.module | |
| +++ b/quickedit.module | |
| @@ -144,6 +144,22 @@ function quickedit_page_build(&$page) { | |
| // hence it will also clear this cache entry. | |
| cache_set("quickedit_user_permissions_hash:$serialized_roles", $permissions_hash, 'cache_page', CACHE_TEMPORARY); | |
| } | |
| + | |
| + // Copied from media_wysiwyg.module:media_wysiwyg_pre_render_text_format() |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/includes/pages.inc b/includes/pages.inc | |
| index a8bac9b..764fcf0 100644 | |
| --- a/includes/pages.inc | |
| +++ b/includes/pages.inc | |
| @@ -387,6 +387,11 @@ function quickedit_ckeditor_get_untransformed_text($entity_type, $entity_id, $fi | |
| if (_quickedit_is_extra_field($entity_type, $field_name)) { | |
| $subform_id = quickedit_extra_field_info($entity_type, $field_name, 'quickedit subform id'); | |
| } | |
| + | |
| + // Get field values to get the format for the field. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/editors/ckeditor/plugin.js b/editors/ckeditor/plugin.js | |
| index 7cecc31..08b7493 100644 | |
| --- a/editors/ckeditor/plugin.js | |
| +++ b/editors/ckeditor/plugin.js | |
| @@ -49,6 +49,9 @@ | |
| } | |
| else if (Drupal.settings.ckeditor) { // If using the CKEditor module | |
| format = Drupal.settings.ckeditor.elements[editor.name]; | |
| + if ((format == null || format === '') && Drupal.settings.quickedit.format) { | |
| + format = Drupal.settings.quickedit.format; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/js/views/AppView.js b/js/views/AppView.js | |
| index b477e7d..f8b4ab8 100644 | |
| --- a/js/views/AppView.js | |
| +++ b/js/views/AppView.js | |
| @@ -18,6 +18,9 @@ | |
| var reload = false; | |
| Drupal.quickedit.AppView = Backbone.View.extend({ | |
| + setReload: function (value) { | |
| + reload = value; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| code > span.kw { color: #268BD2; font-weight: bold; } | |
| code > span.dt { color: #268BD2; } | |
| code > span.dv { color: #D33682; } | |
| code > span.bn { color: #D33682; } | |
| code > span.fl { color: #D33682; } | |
| code > span.ch { color: #4070a0; } | |
| code > span.st { color: #2AA198; } | |
| code > span.co { color: #93A1A1; font-style: italic; } | |
| code > span.ot { color: #A57800; } | |
| code > span.al { color: #CB4B16; font-weight: bold; } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/plugins/display_renderers/panels_renderer_editor.class.php b/plugins/display_renderers/panels_renderer_editor.class.php | |
| index a814eb7..055fc7f 100644 | |
| --- a/plugins/display_renderers/panels_renderer_editor.class.php | |
| +++ b/plugins/display_renderers/panels_renderer_editor.class.php | |
| @@ -464,7 +464,7 @@ class panels_renderer_editor extends panels_renderer_standard { | |
| // Allow others to add/remove links from pane context menu. | |
| // Grouped by 'top', 'style', 'visibility', 'lock', 'cache' and 'bottom' | |
| - drupal_alter('get_pane_links', $links, $pane, $content_type); | |
| + drupal_alter('get_pane_links', $links, $pane, $content_type, $this); |