From ae6205525a1fdbe4022f269f8d73d6442bc4920d Mon Sep 17 00:00:00 2001
From: jian weng <wengjianm@gmail.com>
Date: Wed, 16 May 2018 16:17:59 +0800
Subject: [PATCH] Fix init version form bug

---
 .../publish2/assets/javascripts/publish2.js      |  2 +-
 .../assets/javascripts/publish2/publish2.js      | 16 +++++++++++++---
 .../assets/javascripts/publish2_inline_edit.js   |  2 +-
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/views/themes/publish2/assets/javascripts/publish2.js b/views/themes/publish2/assets/javascripts/publish2.js
index 20ae90a..17d15da 100644
--- a/views/themes/publish2/assets/javascripts/publish2.js
+++ b/views/themes/publish2/assets/javascripts/publish2.js
@@ -1 +1 @@
-"use strict";var _typeof="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e};!function(e){"function"==typeof define&&define.amd?define(["jquery"],e):e("object"===("undefined"==typeof exports?"undefined":_typeof(exports))?require("jquery"):jQuery)}(function(e){function t(i,n){this.$element=e(i),this.options=e.extend({},t.DEFAULTS,e.isPlainObject(n)&&n),this.init()}var i=e(document),n="qor.publish2";return t.prototype={constructor:t,init:function(){this.actionType=this.options.element,this.bind(),this.initActionTemplate()},bind:function(){i.on("click.qor.publish2",".qor-publish2__version",this.loadPublishVersion.bind(this)).on("change.qor.publish2",".qor-pulish2__action-input",this.action.bind(this)).on("qor.selectone.selected qor.selectone.unselected",".qor-pulish2__eventid",this.eventidChanged.bind(this)).on("added.qor.replicator.publish2",this.replicatorAdded.bind(this))},unbind:function(){i.off("click.qor.publish2",".qor-publish2__version").off("change.qor.publish2",".qor-pulish2__action-input").off("qor.selectone.selected qor.selectone.unselected",".qor-pulish2__eventid").off("added.qor.replicator.publish2")},initActionTemplate:function(){e(".qor-pulish2__action").closest(".qor-slideout").length||e(".qor-pulish2__action").prependTo(e(".mdl-layout__content .qor-page__body form").first()).show(),t.initSharedVersion()},replicatorAdded:function(e,i){t.generateSharedVersionLabel(i)},action:function(t){var i=e(t.target),n="checkbox"==i.prop("type"),o=i.val(),r=e(this.actionType[i.data().actionType]),s=r.closest("label");r.length&&(n?(r.prop("checked",i.is(":checked")),i.is(":checked")?s.addClass("is-checked"):s.removeClass("is-checked")):r.val(o))},eventidChanged:function(t,i){i?e(".qor-pulish2__eventid-input").val(i.primaryKey):e(".qor-pulish2__eventid-input").val(""),this.updateDate(i,t.target),e(".qor-pulish2__eventid-input").trigger("change")},updateDate:function(t,i){var n=e(i).closest(".qor-pulish2__action"),o=n.find(".qor-pulish2__action-start"),r=n.find(".qor-pulish2__action-end"),s=n.find(".qor-action__picker-button"),a=s.parent().find("input");t?(o.val(t.ScheduledStartAt),r.val(t.ScheduledEndAt),s.hide(),a.attr("disabled",!0)):(s.show(),a.attr("disabled",!1).closest(".is-disabled").removeClass("is-disabled")),o.trigger("change"),r.trigger("change")},loadPublishVersion:function(t){var i,n=e(t.target).parent("a"),o=n.data().versionUrl,r=n.closest("table"),s=n.closest("tr"),a=s.find("td").length,l=r.hasClass("qor-table--medialibrary"),d=e('<tr class="qor-table__inner-list"><td colspan="'+a+'"></td></tr>'),c=e('<div class="qor-table__inner-block"><div style="text-align: center;"><div class="mdl-spinner mdl-js-spinner is-active"></div></div></div>');if(s.hasClass("is-showing"))return e(".qor-table__inner-list").remove(),r.find("tr").removeClass("is-showing"),!1;if(e(".qor-table__inner-list").remove(),e("table tr").removeClass("is-showing"),s.addClass("is-showing"),l){var h=r.find(">tbody>tr"),u=parseInt(r.width()/217),p=h.index(s)+1,f=Math.ceil(h.length/u),b=Math.ceil(p/u);s=e(h.get(u*b-1)),s.length||(s=h.last()),d=e('<tr class="qor-table__inner-list"><td></td></tr>'),f>1&&d.width(217*u-16)}return s.after(d),i=e(".qor-table__inner-list").find("td"),c.appendTo(i).trigger("enable"),o&&e.get(o,function(t){e(".qor-table__inner-block").html(t).trigger("enable")}),!1},destroy:function(){this.unbind(),this.$element.removeData(n)}},t.generateSharedVersionLabel=function(t){var i=e('[name="shared-version-checkbox"]').html(),n=e('input[name$="ShareableVersion"]'),o={},r=void 0;t&&(n=t.find('input[name$="ShareableVersion"]')),n.each(function(){var t=e(this),n=t.closest(".qor-fieldset"),s=void 0;n.hasClass("qor-fieldset--new")||(r=(Math.random()+1).toString(36).substring(7),o.id=["ShareableVersion",r].join("_"),s=e(window.Mustache.render(i,o)),s.find("input").on("click.qor.publish2",function(){e(this).is(":checked")?t.val("true"):t.val("")}),"true"==t.val()&&s.find("input").prop("checked",!0),s.prependTo(n).trigger("enable"),t.closest(".qor-field").hide())})},t.initSharedVersion=function(){e(".qor-pulish2__action").length&&t.generateSharedVersionLabel()},e.fn.qorSliderAfterShow=e.fn.qorSliderAfterShow||{},e.fn.qorSliderAfterShow.initSharedVersion=t.initSharedVersion,e.fn.qorSliderAfterShow.initPublishForm=function(){var i=e(".qor-pulish2__action"),n=i.find("[data-action-type]"),o=e(".qor-slideout__body form"),r=e(".qor-bottomsheets__body form"),s=t.ELEMENT;i.length&&(r.length?i.prependTo(r.first()):o.length&&i.prependTo(o.first())),i.length&&n.length&&(n.each(function(){var t=e(this);e(s[t.data("actionType")]).closest(".qor-form-section").hide()}),e(".qor-pulish2__action-input").trigger("change.qor.publish2"))},t.DEFAULTS={},t.ELEMENT={scheduledstart:'[name="QorResource.ScheduledStartAt"]',scheduledend:'[name="QorResource.ScheduledEndAt"]',publishready:'[name="QorResource.PublishReady"]',versionname:'[name="QorResource.VersionName"]',eventid:'[name="QorResource.ScheduledEventID"]'},t.plugin=function(i){return this.each(function(){var o,r=e(this),s=r.data(n);if(!s){if(/destroy/.test(i))return;r.data(n,s=new t(this,i))}"string"==typeof i&&e.isFunction(o=s[i])&&o.apply(s)})},e(function(){var i={};i.element=t.ELEMENT,e(document).on("disable.qor.publish2",function(i){t.plugin.call(e(".qor-theme-publish2",i.target),"destroy")}).on("enable.qor.publish2",function(n){t.plugin.call(e(".qor-theme-publish2",n.target),i)}).triggerHandler("enable.qor.publish2")}),t});
\ No newline at end of file
+"use strict";var _typeof="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e};!function(e){"function"==typeof define&&define.amd?define(["jquery"],e):"object"===("undefined"==typeof exports?"undefined":_typeof(exports))?e(require("jquery")):e(jQuery)}(function(b){var e=b(document),o="qor.publish2",i="enable."+o,s="click."+o,d="change."+o,t="qor.selectone.selected qor.selectone.unselected",n="added.qor.replicator.publish2",a="ShareableVersion",r=".qor-publish2__version",g="qor-table__inner-list",m="qor-table__inner-block",v="."+g,l=".qor-pulish2__eventid",c=".qor-pulish2__eventid-input",h=".qor-pulish2__action",u=".qor-pulish2__action-input",y="is-showing";function f(e,t){this.$element=b(e),this.options=b.extend({},f.DEFAULTS,b.isPlainObject(t)&&t),this.init()}return f.prototype={constructor:f,init:function(){this.actionType=this.options.element,this.bind(),this.initActionTemplate()},bind:function(){e.on(s,r,this.loadPublishVersion.bind(this)).on(d,u,this.action.bind(this)).on(t,l,this.eventidChanged.bind(this)).on(n,this.replicatorAdded.bind(this))},unbind:function(){e.off(s,r).off(d,u).off(t,l).off(n)},initActionTemplate:function(){b(h).closest(".qor-slideout").length||b(h).prependTo(b(".mdl-layout__content .qor-page__body form").first()).show(),f.initSharedVersion()},replicatorAdded:function(e,t){f.generateSharedVersionLabel(t)},action:function(e){var t=b(e.target),n="checkbox"==t.prop("type"),i=t.val(),o=b(this.actionType[t.data().actionType]),r=o.closest("label");o.length&&(n?(o.prop("checked",t.is(":checked")),t.is(":checked")?r.addClass("is-checked"):r.removeClass("is-checked")):o.val(i))},eventidChanged:function(e,t){t?b(c).val(t.primaryKey):b(c).val(""),this.updateDate(t,e.target),b(c).trigger("change")},updateDate:function(e,t){var n=b(t).closest(h),i=n.find(".qor-pulish2__action-start"),o=n.find(".qor-pulish2__action-end"),r=n.find(".qor-action__picker-button"),s=r.parent().find("input");e?(i.val(e.ScheduledStartAt),o.val(e.ScheduledEndAt),r.hide(),s.attr("disabled",!0)):(r.show(),s.attr("disabled",!1).closest(".is-disabled").removeClass("is-disabled")),i.trigger("change"),o.trigger("change")},loadPublishVersion:function(e){var t,n=b(e.target).parent("a"),i=n.data().versionUrl,o=n.closest("table"),r=n.closest("tr"),s=r.find("td").length,a=o.hasClass("qor-table--medialibrary"),d=b('<tr class="'+g+'"><td colspan="'+s+'"></td></tr>'),l=b('<div class="'+m+'"><div style="text-align: center;"><div class="mdl-spinner mdl-js-spinner is-active"></div></div></div>');if(r.hasClass(y))return b(v).remove(),o.find("tr").removeClass(y),!1;if(b(v).remove(),b("table tr").removeClass(y),r.addClass(y),a){var c=o.find(">tbody>tr"),h=parseInt(o.width()/217),u=c.index(r)+1,f=Math.ceil(c.length/h),p=Math.ceil(u/h);(r=b(c.get(h*p-1))).length||(r=c.last()),d=b('<tr class="'+g+'"><td></td></tr>'),1<f&&d.width(217*h-16)}return r.after(d),t=b(v).find("td"),l.appendTo(t).trigger("enable"),i&&b.get(i,function(e){b(".qor-table__inner-block").html(e).trigger("enable")}),!1},destroy:function(){this.unbind(),this.$element.removeData(o)}},f.generateSharedVersionLabel=function(e){var i=b('[name="shared-version-checkbox"]').html(),t=b('input[name$="'+a+'"]'),o={},r=void 0;e&&(t=e.find('input[name$="'+a+'"]')),t.each(function(){var e=b(this),t=e.closest(".qor-fieldset"),n=void 0;t.hasClass("qor-fieldset--new")||(r=(Math.random()+1).toString(36).substring(7),o.id=[a,r].join("_"),(n=b(window.Mustache.render(i,o))).find("input").on(s,function(){b(this).is(":checked")?e.val("true"):e.val("")}),"true"==e.val()&&n.find("input").prop("checked",!0),n.prependTo(t).trigger("enable"),e.closest(".qor-field").hide())})},f.initSharedVersion=function(){b(h).length&&f.generateSharedVersionLabel()},b.fn.qorSliderAfterShow=b.fn.qorSliderAfterShow||{},b.fn.qorSliderAfterShow.initSharedVersion=f.initSharedVersion,b.fn.qorSliderAfterShow.initPublishForm=function(){var e=b(h),t=e.find("[data-action-type]"),n=b(".qor-slideout__body form"),i=b(".qor-bottomsheets__body form"),o=e.closest(".qor-bottomsheets").length,r=e.closest(".qor-slideout").length,s=void 0,a=f.ELEMENT;e.length&&(i.length&&o?e.prependTo(i.first()):n.length&&r&&e.prependTo(n.first())),e.length&&t.length&&(r?s=b(".qor-slideout"):o&&(s=b(".qor-bottomsheets")),t.each(function(){var e=b(this);s.find(a[e.data("actionType")]).closest(".qor-form-section").hide()}),b(u).trigger(d))},f.DEFAULTS={},f.ELEMENT={scheduledstart:'[name="QorResource.ScheduledStartAt"]',scheduledend:'[name="QorResource.ScheduledEndAt"]',publishready:'[name="QorResource.PublishReady"]',versionname:'[name="QorResource.VersionName"]',eventid:'[name="QorResource.ScheduledEventID"]'},f.plugin=function(i){return this.each(function(){var e,t=b(this),n=t.data(o);if(!n){if(/destroy/.test(i))return;t.data(o,n=new f(this,i))}"string"==typeof i&&b.isFunction(e=n[i])&&e.apply(n)})},b(function(){var t=".qor-theme-publish2",n={};n.element=f.ELEMENT,b(document).on("disable.qor.publish2",function(e){f.plugin.call(b(t,e.target),"destroy")}).on(i,function(e){f.plugin.call(b(t,e.target),n)}).triggerHandler(i)}),f});
\ No newline at end of file
diff --git a/views/themes/publish2/assets/javascripts/publish2/publish2.js b/views/themes/publish2/assets/javascripts/publish2/publish2.js
index 6d151ae..61c9bcd 100644
--- a/views/themes/publish2/assets/javascripts/publish2/publish2.js
+++ b/views/themes/publish2/assets/javascripts/publish2/publish2.js
@@ -249,13 +249,16 @@
             $types = $action.find('[data-action-type]'),
             $slideoutForm = $('.qor-slideout__body form'),
             $bottomsheetForm = $('.qor-bottomsheets__body form'),
+            isInBottomsheets = $action.closest('.qor-bottomsheets').length,
+            isInSlideout = $action.closest('.qor-slideout').length,
+            $parent,
             element = QorPublish2.ELEMENT;
 
         // move publsh2 actions into slideout form tag
         if ($action.length) {
-            if ($bottomsheetForm.length) {
+            if ($bottomsheetForm.length && isInBottomsheets) {
                 $action.prependTo($bottomsheetForm.first());
-            } else if ($slideoutForm.length) {
+            } else if ($slideoutForm.length && isInSlideout) {
                 $action.prependTo($slideoutForm.first());
             }
         }
@@ -264,9 +267,16 @@
             return;
         }
 
+        if (isInSlideout) {
+            $parent = $('.qor-slideout');
+        } else if (isInBottomsheets) {
+            $parent = $('.qor-bottomsheets');
+        }
+
         $types.each(function() {
             var $this = $(this);
-            $(element[$this.data('actionType')])
+            $parent
+                .find(element[$this.data('actionType')])
                 .closest('.qor-form-section')
                 .hide();
         });
diff --git a/views/themes/publish2/assets/javascripts/publish2_inline_edit.js b/views/themes/publish2/assets/javascripts/publish2_inline_edit.js
index 5929fea..f59a38b 100644
--- a/views/themes/publish2/assets/javascripts/publish2_inline_edit.js
+++ b/views/themes/publish2/assets/javascripts/publish2_inline_edit.js
@@ -1 +1 @@
-"use strict";var _typeof="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e};!function(e){"function"==typeof define&&define.amd?define(["jquery"],e):e("object"===("undefined"==typeof exports?"undefined":_typeof(exports))?require("jquery"):jQuery)}(function(e){function t(r,i){this.$element=e(r),this.options=e.extend({},t.DEFAULTS,e.isPlainObject(i)&&i),this.init()}var r=window.location,i=e(document),n="click.qor.filter";return t.prototype={constructor:t,init:function(){this.bind();var t=this.$element;this.$scheduleTime=t.find(".qor-filter__scheduled-time"),this.$searchButton=t.find(this.options.button),this.$trigger=t.find(this.options.trigger),this.publishReadyOff=e("#qor-publishready__off").data().label},bind:function(){var e=this.options;this.$element.on(n,e.trigger,this.show.bind(this)).on(n,e.clear,this.clear.bind(this)).on(n,e.button,this.search.bind(this)),i.on(n,this.close)},unbind:function(){var e=this.options;this.$element.off(n,e.trigger,this.show.bind(this)).off(n,e.clear,this.clear.bind(this)).off(n,e.button,this.search.bind(this))},show:function(){this.$element.find(".qor-filter__dropdown").toggle()},close:function(t){var r=e(t.target),i=e(".qor-filter__dropdown"),n=i.is(":visible"),o=r.closest(".qor-filter__dropdown").length,a=r.closest(".qor-filter-toggle").length,l=r.closest(".qor-modal").length,s=r.closest(".ui-timepicker-wrapper").length;n&&(o||a||l||s)||i.hide()},clear:function(t){var r=e(t.target),i=this.$trigger,n=i.find(".qor-selector-label"),o=i.find(".qor-publishready-label");return r.data().type?(o.html("").parent().hide(),e('[name="QorResource.PublishReady"]').prop("checked",!1)):(n.parent().hide(),this.$scheduleTime.val("")),r.remove(),this.$searchButton.click(),!1},getUrlParameter:function(e){var t=r.search;e=e.replace(/[\[]/,"\\[").replace(/[\]]/,"\\]");var i=new RegExp("[\\?&]"+e+"=([^&#]*)"),n=i.exec(t);return null===n?"":decodeURIComponent(n[1].replace(/\+/g," "))},updateQueryStringParameter:function(e,t,i){var n=i||r.href,o=String(e).replace(/[\\^$*+?.()|[\]{}]/g,"\\$&"),a=new RegExp("([?&])"+o+"=.*?(&|$)","i"),l=-1!==n.indexOf("?")?"&":"?";return n.match(a)?n.replace(a,"$1"+e+"="+t+"$2"):n+l+e+"="+t},search:function(){var t,r=this.$element.find("[data-search-param]"),i=this;r.length&&(r.each(function(){var r=e(this),n=r.data().searchParam,o=r.find('[name="QorResource.PublishReady"]').is(":checked"),a=r.val();"publish_draft_content"==n&&(a=o?"true":""),t=i.updateQueryStringParameter(n,a,t)}),window.location.href=t)},destroy:function(){this.unbind(),this.$element.removeData("qor.filter")}},t.DEFAULTS={trigger:!1,button:!1,clear:!1},t.plugin=function(r){return this.each(function(){var i,n=e(this),o=n.data("qor.filter");if(!o){if(/destroy/.test(r))return;n.data("qor.filter",o=new t(this,r))}"string"==typeof r&&e.isFunction(i=o[r])&&i.apply(o)})},e(function(){var r='[data-toggle="qor.filter.time"]',i={trigger:"a.qor-filter-toggle",button:".qor-filter__button-search",clear:".qor-selector-clear"};e(document).on("disable.qor.filter",function(i){t.plugin.call(e(r,i.target),"destroy")}).on("enable.qor.filter",function(n){t.plugin.call(e(r,n.target),i)}).triggerHandler("enable.qor.filter")}),t});
\ No newline at end of file
+"use strict";var _typeof="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t};!function(t){"function"==typeof define&&define.amd?define(["jquery"],t):"object"===("undefined"==typeof exports?"undefined":_typeof(exports))?t(require("jquery")):t(jQuery)}(function(l){var s=window.location,e=l(document),r="qor.filter",t="enable."+r,i="click."+r,c=".qor-filter__dropdown",a='[name="QorResource.PublishReady"]';function o(t,e){this.$element=l(t),this.options=l.extend({},o.DEFAULTS,l.isPlainObject(e)&&e),this.init()}return o.prototype={constructor:o,init:function(){this.bind();var t=this.$element;this.$scheduleTime=t.find(".qor-filter__scheduled-time"),this.$searchButton=t.find(this.options.button),this.$trigger=t.find(this.options.trigger),this.publishReadyOff=l("#qor-publishready__off").data().label},bind:function(){var t=this.options;this.$element.on(i,t.trigger,this.show.bind(this)).on(i,t.clear,this.clear.bind(this)).on(i,t.button,this.search.bind(this)),e.on(i,this.close)},unbind:function(){var t=this.options;this.$element.off(i,t.trigger,this.show.bind(this)).off(i,t.clear,this.clear.bind(this)).off(i,t.button,this.search.bind(this))},show:function(){this.$element.find(c).toggle()},close:function(t){var e=l(t.target),i=l(c),n=i.is(":visible"),r=e.closest(c).length,o=e.closest(".qor-filter-toggle").length,a=e.closest(".qor-modal").length,s=e.closest(".ui-timepicker-wrapper").length;n&&(r||o||a||s)||i.hide()},clear:function(t){var e=l(t.target),i=this.$trigger,n=i.find(".qor-selector-label"),r=i.find(".qor-publishready-label");return e.data().type?(r.html("").parent().hide(),l(a).prop("checked",!1)):(n.parent().hide(),this.$scheduleTime.val("")),e.remove(),this.$searchButton.click(),!1},getUrlParameter:function(t){var e=s.search;t=t.replace(/[\[]/,"\\[").replace(/[\]]/,"\\]");var i=new RegExp("[\\?&]"+t+"=([^&#]*)").exec(e);return null===i?"":decodeURIComponent(i[1].replace(/\+/g," "))},updateQueryStringParameter:function(t,e,i){var n=i||s.href,r=String(t).replace(/[\\^$*+?.()|[\]{}]/g,"\\$&"),o=new RegExp("([?&])"+r+"=.*?(&|$)","i"),a=-1!==n.indexOf("?")?"&":"?";return n.match(o)?n.replace(o,"$1"+t+"="+e+"$2"):n+a+t+"="+e},search:function(){var r,t=this.$element.find("[data-search-param]"),o=this;t.length&&(t.each(function(){var t=l(this),e=t.data().searchParam,i=t.find(a).is(":checked"),n=t.val();"publish_draft_content"==e&&(n=i?"true":""),r=o.updateQueryStringParameter(e,n,r)}),window.location.href=r)},destroy:function(){this.unbind(),this.$element.removeData(r)}},o.DEFAULTS={trigger:!1,button:!1,clear:!1},o.plugin=function(n){return this.each(function(){var t,e=l(this),i=e.data(r);if(!i){if(/destroy/.test(n))return;e.data(r,i=new o(this,n))}"string"==typeof n&&l.isFunction(t=i[n])&&t.apply(i)})},l(function(){var e='[data-toggle="qor.filter.time"]',i={trigger:"a.qor-filter-toggle",button:".qor-filter__button-search",clear:".qor-selector-clear"};l(document).on("disable.qor.filter",function(t){o.plugin.call(l(e,t.target),"destroy")}).on(t,function(t){o.plugin.call(l(e,t.target),i)}).triggerHandler(t)}),o});
\ No newline at end of file