Changeset 22348

Timestamp:

10/31/2012 09:43:59 PM (12 years ago)

Author:

koopersmith

Message:

Media: Update gallery editing to work with the new frame view. see #21390.

Location:

trunk/wp-includes

Files:

• js/mce-view.js (modified) (1 diff)
• js/media-views.js (modified) (6 diffs)
• script-loader.php (modified) (2 diffs)

trunk/wp-includes/js/mce-view.js

@@ -691 +691 @@
 
             edit: function() {
-                if ( ! wp.media.view || this.workflow )
+                if ( ! wp.media.view || this.frame )
                     return;
 
-                this.workflow = wp.media({
+                this.frame = wp.media({
                     state:     'gallery',
-                    selection: this.attachments.models,
                     title:     mceview.l10n.editGallery,
                     editing:   true,
-                    multiple:  true
+                    multiple:  true,
+                    selection: new wp.media.model.Selection( this.attachments.models, {
+                        props:    this.attachments.props.toJSON(),
+                        multiple: true
+                    })
                 });
 
-                // Create a single-use workflow. If the workflow is closed,
+                // Create a single-use frame. If the frame is closed,
                 // then detach it from the DOM and remove the reference.
-                this.workflow.on( 'close', function() {
-                    this.workflow.detach();
-                    delete this.workflow;
+                this.frame.on( 'close', function() {
+                    this.frame.detach();
+                    delete this.frame;
                 }, this );
 
                 // Update the `shortcode` and `attachments`.
-                this.workflow.on( 'update:gallery', function( selection ) {
+                this.frame.get('gallery').on( 'update', function( selection ) {
                     var view = mceview.get('gallery');
 

trunk/wp-includes/js/media-views.js

@@ -115 +115 @@
             multiple: false,
             describe: false,
-            title:    l10n.mediaLibrary
+            title:    l10n.mediaLibraryTitle
         },
 
@@ -263 +263 @@
             multiple:   false,
             describe:   true,
-            title:      l10n.createGallery,
-            edge:       199
+            title:      l10n.createGalleryTitle,
+            edge:       199,
+            editing:    false
         },
 
@@ -325 +326 @@
                 modal:     true,
                 multiple:  false,
-                uploader:  true
+                uploader:  true,
+                editing:   false
             });
 
@@ -380 +382 @@
                 }),
                 new media.controller.Gallery({
-                    library: options.selection
+                    library: options.selection,
+                    editing: options.editing
                 })
             ]);
@@ -825 +828 @@
 
             this.options.items = {
-                'update-gallery': {
+                update: {
                     style:    'primary',
-                    text:     editing ? l10n.updateGallery : l10n.insertGalleryIntoPost,
+                    text:     editing ? l10n.updateGallery : l10n.insertGallery,
                     priority: 40,
                     click:    function() {
@@ -837 +840 @@
                 },
 
-                'return-to-library': {
-                    text:     editing ? l10n.addImagesFromLibrary : l10n.returnToLibrary,
-                    priority: -40,
+                cancel: {
+                    text:     l10n.cancel,
+                    priority: -60,
 
                     click: function() {
-                        this.controller.state('library');
+                        if ( editing )
+                            controller.close();
+                        else
+                            controller.state('library');
                     }
                 }

trunk/wp-includes/script-loader.php

@@ -326 +326 @@
         'insertMedia' => __( 'Insert Media' ),
         'search'      => __( 'Search' ),
+        'cancel'      => __( 'Cancel' ),
+        'addImages'   => __( 'Add images' ),
 
         // Library
-        'mediaLibrary'          => __( 'Media Library' ),
+        'mediaLibraryTitle'     => __( 'Media Library' ),
         'createNewGallery'      => __( 'Create a new gallery' ),
         'insertIntoPost'        => __( 'Insert into post' ),
@@ -334 +336 @@
 
         // Gallery
-        'createGallery'          => __( 'Create Gallery' ),
-        'returnToLibrary'        => __( 'Return to media library' ),
-        'continueEditingGallery' => __( 'Continue editing gallery' ),
-        'insertGalleryIntoPost'  => __( 'Insert gallery into post' ),
-        'updateGallery'          => __( 'Update gallery' ),
-        'addImagesFromLibrary'   => __( 'Add images from media library' ),
+        'createGalleryTitle' => __( 'Create Gallery' ),
+        'insertGallery'      => __( 'Insert gallery' ),
+        'updateGallery'      => __( 'Update gallery' ),
     ) );