Merge branch 'release/1.6.6'

CHANGELOG.md

@@ -1,3 +1,9 @@
+# v1.6.6
+## 10/27/2017
+
+1. [](#new)
+    * Fixed issue where sortable media in expert mode would reset frontmatter [#1252](https://github.com/getgrav/grav-plugin-admin/issues/1252)
+
 # v1.6.5
 ## 10/26/2017
 

blueprints.yaml

@@ -1,5 +1,5 @@
 name: Admin Panel
-version: 1.6.5
+version: 1.6.6
 description: Adds an advanced administration panel to manage your site
 icon: empire
 author:

themes/grav/app/pages/page/media.js

@@ -44,30 +44,33 @@ export default class PageMedia extends FilesField {
             this.attachDragDrop();
         }
 
-        this.sortable = new Sortable(this.container.get(0), {
-            animation: 150,
-            // forceFallback: true,
-            setData: (dataTransfer, target) => {
-                target = $(target);
-                let uri = encodeURI(target.find('.dz-filename').text());
-                let shortcode = UriToMarkdown(uri);
-                this.dropzone.disable();
-                target.addClass('hide-backface');
-                dataTransfer.effectAllowed = 'copy';
-                dataTransfer.setData('text', shortcode);
-            },
-            onSort: () => {
-                const field = $(`[name="${this.container.data('dropzone-field')}"]`);
-                let names = [];
-                this.container.find('[data-dz-name]').each((index, file) => {
-                    file = $(file);
-                    const name = file.text().trim();
-                    names.push(name);
-                });
+        const field = $(`[name="${this.container.data('dropzone-field')}"]`);
 
-                field.val(names.join(','));
-            }
-        });
+        if (field.length) {
+            this.sortable = new Sortable(this.container.get(0), {
+                animation: 150,
+                // forceFallback: true,
+                setData: (dataTransfer, target) => {
+                    target = $(target);
+                    let uri = encodeURI(target.find('.dz-filename').text());
+                    let shortcode = UriToMarkdown(uri);
+                    this.dropzone.disable();
+                    target.addClass('hide-backface');
+                    dataTransfer.effectAllowed = 'copy';
+                    dataTransfer.setData('text', shortcode);
+                },
+                onSort: () => {
+                    let names = [];
+                    this.container.find('[data-dz-name]').each((index, file) => {
+                        file = $(file);
+                        const name = file.text().trim();
+                        names.push(name);
+                    });
+
+                    field.val(names.join(','));
+                }
+            });
+        }
     }
 
     fetchMedia() {

themes/grav/templates/forms/fields/pagemedia/pagemedia.html.twig

@@ -15,7 +15,10 @@
              data-media-path="{{ url(context.relativePagePath) }}"
              data-dropzone-options="{{ dropzoneSettings|json_encode|e('html_attr') }}"
              data-dropzone-field="{{ (scope ~ field.name)|fieldName }}"></div>
+
+        {% if admin.session.expert == '0' %}
         <input type="hidden" name="{{ (scope ~ field.name)|fieldName }}" value="{{ value|e }}" />
+        {% endif %}
     </div>
 </div>
 {% else %}