Changeset 1645990

Timestamp:

04/26/2017 06:26:38 PM (9 years ago)

Author:

demur

Message:

Fixing bug related to the update of the tinyMCE library that caused emerging of undesired instances of DG at the top of the post after completing edit of the existing DG instance

Location:

document-gallery/trunk/assets/js

Files:

• media_manager.js (modified) (2 diffs)
• media_manager.min.js (modified) (1 diff)

document-gallery/trunk/assets/js/media_manager.js

@@ -405 +405 @@
 
                                 controller.close();
-                                //state.trigger( 'update', state.get('library') ); // calling for workflow.state update, so just execute its contents
-                                wp.media.editor.insert(wp.media.dg.shortcode(state.get('library')).string().replace(/\sdgorder=/ig, ' order=').replace(/\sdgorderby=/ig, ' orderby='));
+                                if ( editing ) {
+                                    state.trigger('update', state.get('library')); // calling for workflow.state update, so just execute its contents
+                                } else {
+                                    wp.media.editor.insert(wp.media.dg.shortcode(state.get('library')).string().replace(/\sdgorder=/ig, ' order=').replace(/\sdgorderby=/ig, ' orderby='));
+                                }
 
                                 // Restore and reset the default state.
@@ -517 +520 @@
                     _.each(this.state, function (state) {
                         frame.state(state).on('update', function (selection) {
-                            update(media[type].shortcode(selection).string(), type === 'dg');
+                            update(media[type].shortcode(selection).string().replace(/\sdgorder=/ig, ' order=').replace(/\sdgorderby=/ig, ' orderby='), type === 'dg');
                         });
                     });

document-gallery/trunk/assets/js/media_manager.min.js

@@ -1 +1 @@
 (function(h,g){if("function"===typeof wp.media.collection){var d,a=wp.media;d=a.view.l10n="undefined"===typeof _wpMediaViewsL10n?{}:_wpMediaViewsL10n;jQuery.extend(d,DGl10n);a.controller.dgEdit=a.controller.Library.extend({defaults:{id:"dg-edit",title:d.editdgTitle,multiple:!1,searchable:!1,date:!1,sortable:!0,display:!1,content:"browse",toolbar:"dg-edit",describe:!0,displaySettings:!0,dragInfo:!0,idealColumnWidth:170,editing:!1,priority:60,syncSelection:!1},initialize:function(){this.get("library")||
 this.set("library",new a.model.Selection);this.get("AttachmentView")||this.set("AttachmentView",a.view.Attachment.EditLibrary);a.controller.Library.prototype.initialize.apply(this,arguments)},activate:function(){this.get("library");this.get("library").observe(wp.Uploader.queue);this.frame.on("content:render:browse",this.dgSettings,this);a.controller.Library.prototype.activate.apply(this,arguments)},deactivate:function(){this.get("library").unobserve(wp.Uploader.queue);this.frame.off("content:render:browse",
-this.dgSettings,this);a.controller.Library.prototype.deactivate.apply(this,arguments)},dgSettings:function(b){if(this.get("displaySettings")){var c=this.get("library");c&&b&&(c.dg=c.dg||new Backbone.Model,b.sidebar.set({dg:new a.view.Settings.dg({controller:this,model:c.dg,priority:40})}),b.toolbar.set("reverse",{text:d.reverseOrder,priority:80,click:function(){c.reset(c.toArray().reverse())}}))}}});a.controller.dgAdd=a.controller.Library.extend({defaults:g.defaults({id:"dg-library",title:d.addTodgTitle,
-multiple:"add",filterable:"uploaded",menu:"dg",toolbar:"dg-add",priority:100,syncSelection:!1},a.controller.Library.prototype.defaults),initialize:function(){this.get("library")||this.set("library",a.query());a.controller.Library.prototype.initialize.apply(this,arguments)},activate:function(){var b=this.get("library"),c=this.frame.state("dg-edit").get("library");this.editLibrary&&this.editLibrary!==c&&b.unobserve(this.editLibrary);b.validator=function(b){return!!this.mirroring.get(b.cid)&&!c.get(b.cid)&&
-a.model.Selection.prototype.validator.apply(this,arguments)};b.reset(b.mirroring.models,{silent:!0});b.observe(c);this.editLibrary=c;a.controller.Library.prototype.activate.apply(this,arguments)}});a.view.Settings.dg=a.view.Settings.extend({update:function(b){var c=this.model.get(b),a=this.$('[data-setting="'+b+'"]');a.length&&(a.is("select")?(c=a.find('[value="'+c+'"]'),c.length?(a.find("option").prop("selected",!1),c.prop("selected",!0)):this.model.set(b,a.find(":selected").val())):a.hasClass("button-group")?
-(b=a.find("button").removeClass("active"),b.filter('[value="'+c+'"]').addClass("active")):a.is('input[type="text"], input[type="number"], textarea')?a.is(":focus")||a.val(c):a.is('input[type="checkbox"]')&&a.prop("checked",!!c&&"false"!==c))},className:"collection-settings dg-settings",template:a.template("dg-settings")});var e=wp.media.view.MediaFrame.Post;wp.media.view.MediaFrame.Post=e.extend({initialize:function(){e.prototype.initialize.apply(this,arguments);this.states.add([new a.controller.Library({id:"dg",
+this.dgSettings,this);a.controller.Library.prototype.deactivate.apply(this,arguments)},dgSettings:function(c){if(this.get("displaySettings")){var b=this.get("library");b&&c&&(b.dg=b.dg||new Backbone.Model,c.sidebar.set({dg:new a.view.Settings.dg({controller:this,model:b.dg,priority:40})}),c.toolbar.set("reverse",{text:d.reverseOrder,priority:80,click:function(){b.reset(b.toArray().reverse())}}))}}});a.controller.dgAdd=a.controller.Library.extend({defaults:g.defaults({id:"dg-library",title:d.addTodgTitle,
+multiple:"add",filterable:"uploaded",menu:"dg",toolbar:"dg-add",priority:100,syncSelection:!1},a.controller.Library.prototype.defaults),initialize:function(){this.get("library")||this.set("library",a.query());a.controller.Library.prototype.initialize.apply(this,arguments)},activate:function(){var c=this.get("library"),b=this.frame.state("dg-edit").get("library");this.editLibrary&&this.editLibrary!==b&&c.unobserve(this.editLibrary);c.validator=function(c){return!!this.mirroring.get(c.cid)&&!b.get(c.cid)&&
+a.model.Selection.prototype.validator.apply(this,arguments)};c.reset(c.mirroring.models,{silent:!0});c.observe(b);this.editLibrary=b;a.controller.Library.prototype.activate.apply(this,arguments)}});a.view.Settings.dg=a.view.Settings.extend({update:function(c){var b=this.model.get(c),e=this.$('[data-setting="'+c+'"]');e.length&&(e.is("select")?(b=e.find('[value="'+b+'"]'),b.length?(e.find("option").prop("selected",!1),b.prop("selected",!0)):this.model.set(c,e.find(":selected").val())):e.hasClass("button-group")?
+(c=e.find("button").removeClass("active"),c.filter('[value="'+b+'"]').addClass("active")):e.is('input[type="text"], input[type="number"], textarea')?e.is(":focus")||e.val(b):e.is('input[type="checkbox"]')&&e.prop("checked",!!b&&"false"!==b))},className:"collection-settings dg-settings",template:a.template("dg-settings")});var f=wp.media.view.MediaFrame.Post;wp.media.view.MediaFrame.Post=f.extend({initialize:function(){f.prototype.initialize.apply(this,arguments);this.states.add([new a.controller.Library({id:"dg",
 title:d.dgMenuTitle,priority:50,toolbar:"main-dg",filterable:"all",multiple:"add",editable:!1,library:a.query(this.options.library)}),new a.controller.dgEdit({library:this.options.selection,editing:this.options.editing,menu:"dg"}),new a.controller.dgAdd]);this.on("menu:create:dg",this.createMenu,this);this.on("toolbar:create:main-dg",this.createToolbar,this);this.on("menu:render:dg",this.dgMenu,this);this.on("toolbar:render:main-dg",this.maindgToolbar,this);this.on("toolbar:render:dg-edit",this.dgEditToolbar,
-this);this.on("toolbar:render:dg-add",this.dgAddToolbar,this)},dgMenu:function(b){var c=this.lastState(),f=c&&c.id,e=this;b.set({cancel:{text:d.canceldgTitle,priority:20,click:function(){f?e.setState(f):e.close();this.controller.modal.focusManager.focus()}},separateCancel:new a.View({className:"separator",priority:40})})},maindgToolbar:function(b){var c=this;this.selectionStatusToolbar(b);b.set("dg",{style:"primary",text:d.dgButton,priority:60,requires:{selection:!0},click:function(){var b=c.state().get("selection");
-c.state("dg-edit").set("library",new a.model.Selection(b.models,{props:b.props.toJSON(),multiple:!0}));this.controller.setState("dg-edit");this.controller.modal.focusManager.focus()}})},dgEditToolbar:function(){var b=this.state().get("editing");this.toolbar.set(new a.view.Toolbar({controller:this,items:{insert:{style:"primary",text:b?d.updatedg:d.insertdg,priority:80,requires:{library:!0},click:function(){var c=this.controller,b=c.state();c.close();wp.media.editor.insert(wp.media.dg.shortcode(b.get("library")).string().replace(/\sdgorder=/ig,
-" order=").replace(/\sdgorderby=/ig," orderby="));c.setState(c.options.state);c.reset();"undefined"!=typeof tinyMCE&&null!==tinyMCE.activeEditor&&tinyMCE.activeEditor.fire("update.dg")}}}}))},dgAddToolbar:function(){this.toolbar.set(new a.view.Toolbar({controller:this,items:{insert:{style:"primary",text:d.addTodg,priority:80,requires:{selection:!0},click:function(){var b=this.controller,c=b.state();b.state("dg-edit").get("library").add(c.get("selection").models);c.trigger("reset");b.setState("dg-edit")}}}}))}});
+this);this.on("toolbar:render:dg-add",this.dgAddToolbar,this)},dgMenu:function(c){var b=this.lastState(),e=b&&b.id,f=this;c.set({cancel:{text:d.canceldgTitle,priority:20,click:function(){e?f.setState(e):f.close();this.controller.modal.focusManager.focus()}},separateCancel:new a.View({className:"separator",priority:40})})},maindgToolbar:function(c){var b=this;this.selectionStatusToolbar(c);c.set("dg",{style:"primary",text:d.dgButton,priority:60,requires:{selection:!0},click:function(){var c=b.state().get("selection");
+b.state("dg-edit").set("library",new a.model.Selection(c.models,{props:c.props.toJSON(),multiple:!0}));this.controller.setState("dg-edit");this.controller.modal.focusManager.focus()}})},dgEditToolbar:function(){var c=this.state().get("editing");this.toolbar.set(new a.view.Toolbar({controller:this,items:{insert:{style:"primary",text:c?d.updatedg:d.insertdg,priority:80,requires:{library:!0},click:function(){var b=this.controller,a=b.state();b.close();c?a.trigger("update",a.get("library")):wp.media.editor.insert(wp.media.dg.shortcode(a.get("library")).string().replace(/\sdgorder=/ig,
+" order=").replace(/\sdgorderby=/ig," orderby="));b.setState(b.options.state);b.reset();"undefined"!=typeof tinyMCE&&null!==tinyMCE.activeEditor&&tinyMCE.activeEditor.fire("update.dg")}}}}))},dgAddToolbar:function(){this.toolbar.set(new a.view.Toolbar({controller:this,items:{insert:{style:"primary",text:d.addTodg,priority:80,requires:{selection:!0},click:function(){var c=this.controller,b=c.state();c.state("dg-edit").get("library").add(b.get("selection").models);b.trigger("reset");c.setState("dg-edit")}}}}))}});
 wp.media._dgDefaults={id:wp.media.view.settings.post&&wp.media.view.settings.post.id,columns:dgDefaults.columns,fancy:dgDefaults.fancy,relation:dgDefaults.relation,limit:dgDefaults.limit,mime_types:dgDefaults.mime_types,post_status:dgDefaults.post_status,post_type:dgDefaults.post_type,attachment_pg:dgDefaults.attachment_pg,descriptions:dgDefaults.descriptions,new_window:dgDefaults.new_window,paginate:dgDefaults.paginate,dgorder:dgDefaults.order,dgorderby:dgDefaults.orderby};wp.media.dgDefaults=wp.media.view.settings.dgDefaults?
-g.extend({},wp.media._dgDefaults,wp.media.view.settings.dgDefaults):wp.media._dgDefaults;wp.media.dg=new wp.media.collection({tag:"dg",editTitle:wp.media.view.l10n.editdgTitle,defaults:wp.media.dgDefaults,setDefaults:function(b){var c=this,a=!g.isEqual(wp.media.dgDefaults,wp.media._dgDefaults);g.each(this.defaults,function(d,e){b[e]=c.coerce(b,e);d!==b[e]||a&&d!==wp.media._dgDefaults[e]||delete b[e]});return b}})}})(jQuery,_);
-"undefined"!==typeof window.wp.mce&&"undefined"!==typeof window.wp.mce.views&&function(h,g,d,a){base={state:[],edit:function(a,b){if(-1==a.search(/\sids\s*=/gi)||-1<a.search(/\s(?!(?:ids|attachment_pg|columns|new_window|descriptions|fancy|orderby|order|paginate|limit)\s*=)[\w\-]+\s*=/gi))tinyMCE.activeEditor.windowManager.alert(DGl10n.unfitSCalert);else{var c=this.type,f=d[c].edit(a.replace(/\sorder\s*=/ig," dgorder=").replace(/\sorderby\s*=/ig," dgorderby="));this.pausePlayers&&this.pausePlayers();
-_.each(this.state,function(a){f.state(a).on("update",function(a){b(d[c].shortcode(a).string(),"dg"===c)})});f.on("close",function(){f.detach()});f.open()}}};h=_.extend({},base,{state:["dg-edit"],template:d.template("editor-dg"),initialize:function(){d.dg.attachments(this.shortcode,d.view.settings.post.id);var a=this.shortcode.attrs.named,b=this.text,c={};for(prop in a)-1<b.indexOf(" "+prop+"=")&&(c[prop]=a[prop]);-1<b.indexOf(" dgorderby=")&&(c.orderby=a.dgorderby);-1<b.indexOf(" dgorder=")&&(c.order=
-a.dgorder);this.render('<div data-shortcode="'+encodeURIComponent(JSON.stringify(c))+'"><div class="loading-placeholder"><div class="dashicons dashicons-admin-media"></div><div class="wpview-loading"><ins></ins></div></div></div>')}});g.register("dg",_.extend({},h))}(window,window.wp.mce.views,window.wp.media,window.jQuery);
+g.extend({},wp.media._dgDefaults,wp.media.view.settings.dgDefaults):wp.media._dgDefaults;wp.media.dg=new wp.media.collection({tag:"dg",editTitle:wp.media.view.l10n.editdgTitle,defaults:wp.media.dgDefaults,setDefaults:function(c){var b=this,a=!g.isEqual(wp.media.dgDefaults,wp.media._dgDefaults);g.each(this.defaults,function(d,f){c[f]=b.coerce(c,f);d!==c[f]||a&&d!==wp.media._dgDefaults[f]||delete c[f]});return c}})}})(jQuery,_);
+"undefined"!==typeof window.wp.mce&&"undefined"!==typeof window.wp.mce.views&&function(h,g,d,a){base={state:[],edit:function(a,c){if(-1==a.search(/\sids\s*=/gi)||-1<a.search(/\s(?!(?:ids|attachment_pg|columns|new_window|descriptions|fancy|orderby|order|paginate|limit)\s*=)[\w\-]+\s*=/gi))tinyMCE.activeEditor.windowManager.alert(DGl10n.unfitSCalert);else{var b=this.type,e=d[b].edit(a.replace(/\sorder\s*=/ig," dgorder=").replace(/\sorderby\s*=/ig," dgorderby="));this.pausePlayers&&this.pausePlayers();
+_.each(this.state,function(a){e.state(a).on("update",function(a){c(d[b].shortcode(a).string().replace(/\sdgorder=/ig," order=").replace(/\sdgorderby=/ig," orderby="),"dg"===b)})});e.on("close",function(){e.detach()});e.open()}}};h=_.extend({},base,{state:["dg-edit"],template:d.template("editor-dg"),initialize:function(){d.dg.attachments(this.shortcode,d.view.settings.post.id);var a=this.shortcode.attrs.named,c=this.text,b={};for(prop in a)-1<c.indexOf(" "+prop+"=")&&(b[prop]=a[prop]);-1<c.indexOf(" dgorderby=")&&
+(b.orderby=a.dgorderby);-1<c.indexOf(" dgorder=")&&(b.order=a.dgorder);this.render('<div data-shortcode="'+encodeURIComponent(JSON.stringify(b))+'"><div class="loading-placeholder"><div class="dashicons dashicons-admin-media"></div><div class="wpview-loading"><ins></ins></div></div></div>')}});g.register("dg",_.extend({},h))}(window,window.wp.mce.views,window.wp.media,window.jQuery);