From 4b923722beeb84449995d855f95f4132655f5b8d Mon Sep 17 00:00:00 2001 From: Toby Zerner Date: Sat, 3 Oct 2015 17:35:55 +0930 Subject: [PATCH] Add vendor prefix to admin JS too --- extensions/tags/js/admin/dist/extension.js | 2 +- extensions/tags/js/admin/src/addTagsPane.js | 2 +- extensions/tags/js/admin/src/addTagsPermissionScope.js | 6 +++--- .../tags/js/admin/src/components/EditTagModal.js | 2 +- extensions/tags/js/admin/src/components/TagsPage.js | 8 ++++---- extensions/tags/js/admin/src/main.js | 10 +++++----- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/extensions/tags/js/admin/dist/extension.js b/extensions/tags/js/admin/dist/extension.js index a7e90d542..5a2de01ea 100644 --- a/extensions/tags/js/admin/dist/extension.js +++ b/extensions/tags/js/admin/dist/extension.js @@ -1 +1 @@ -!function(t,e){"function"==typeof define&&define.amd?define(["jquery"],e):"object"==typeof exports?module.exports=e(require("jquery")):t.sortable=e(t.jQuery)}(this,function(t){"use strict";var e,n,a=t(),r=[],o=function(t){t.off("dragstart.h5s"),t.off("dragend.h5s"),t.off("selectstart.h5s"),t.off("dragover.h5s"),t.off("dragenter.h5s"),t.off("drop.h5s")},i=function(t){t.off("dragover.h5s"),t.off("dragenter.h5s"),t.off("drop.h5s")},s=function(t,e){t.dataTransfer.effectAllowed="move",t.dataTransfer.setData("text",""),t.dataTransfer.setDragImage&&t.dataTransfer.setDragImage(e.item,e.x,e.y)},u=function(t,e){return e.x||(e.x=parseInt(t.pageX-e.draggedItem.offset().left)),e.y||(e.y=parseInt(t.pageY-e.draggedItem.offset().top)),e},l=function(t){return{item:t[0],draggedItem:t}},c=function(t,e){var n=l(e);n=u(t,n),s(t,n)},d=function(t,e){return"undefined"==typeof t?e:t},f=function(t){t.removeData("opts"),t.removeData("connectWith"),t.removeData("items"),t.removeAttr("aria-dropeffect")},m=function(t){t.removeAttr("aria-grabbed"),t.removeAttr("draggable"),t.removeAttr("role")},p=function(t,e){return t[0]===e[0]?!0:void 0!==t.data("connectWith")?t.data("connectWith")===e.data("connectWith"):!1},g=function(t){var e=t.data("opts")||{},n=t.children(e.items),a=e.handle?n.find(e.handle):n;i(t),f(t),a.off("mousedown.h5s"),o(n),m(n)},h=function(e){var n=e.data("opts"),a=e.children(n.items),r=n.handle?a.find(n.handle):a;e.attr("aria-dropeffect","move"),r.attr("draggable","true"),"function"!=typeof document.createElement("span").dragDrop||n.disableIEFix||r.on("mousedown.h5s",function(){-1!==a.index(this)?this.dragDrop():t(this).parents(n.items)[0].dragDrop()})},v=function(t){var e=t.data("opts"),n=t.children(e.items),a=e.handle?n.find(e.handle):n;t.attr("aria-dropeffect","none"),a.attr("draggable",!1),a.off("mousedown.h5s")},b=function(t){var e=t.data("opts"),n=t.children(e.items),a=e.handle?n.find(e.handle):n;o(n),a.off("mousedown.h5s"),i(t)},y=function(o,i){var u=t(o),l=String(i);return i=t.extend({connectWith:!1,placeholder:null,dragImage:null,disableIEFix:!1,placeholderClass:"sortable-placeholder",draggingClass:"sortable-dragging"},i),u.each(function(){var o=t(this);if(/enable|disable|destroy/.test(l))return void y[l](o);i=d(o.data("opts"),i),o.data("opts",i),b(o);var u,f,m,g=o.children(i.items),v=null===i.placeholder?t("<"+(/^ul|ol$/i.test(this.tagName)?"li":"div")+' class="'+i.placeholderClass+'"/>'):t(i.placeholder).addClass(i.placeholderClass);if(!o.attr("data-sortable-id")){var T=r.length;r[T]=o,o.attr("data-sortable-id",T),g.attr("data-item-sortable-id",T)}o.data("items",i.items),a=a.add(v),i.connectWith&&o.data("connectWith",i.connectWith),h(o),g.attr("role","option"),g.attr("aria-grabbed","false"),g.on("dragstart.h5s",function(a){a.stopImmediatePropagation(),i.dragImage?(s(a.originalEvent,{item:i.dragImage,x:0,y:0}),console.log("WARNING: dragImage option is deprecated and will be removed in the future!")):c(a.originalEvent,t(this),i.dragImage),e=t(this),e.addClass(i.draggingClass),e.attr("aria-grabbed","true"),u=e.index(),n=e.height(),f=t(this).parent(),e.parent().triggerHandler("sortstart",{item:e,startparent:f})}),g.on("dragend.h5s",function(){e&&(e.removeClass(i.draggingClass),e.attr("aria-grabbed","false"),e.show(),a.detach(),m=t(this).parent(),e.parent().triggerHandler("sortstop",{item:e,startparent:f}),(u!==e.index()||f.get(0)!==m.get(0))&&e.parent().triggerHandler("sortupdate",{item:e,index:m.children(m.data("items")).index(e),oldindex:g.index(e),elementIndex:e.index(),oldElementIndex:u,startparent:f,endparent:m}),e=null,n=null)}),t(this).add([v]).on("drop.h5s",function(n){return p(o,t(e).parent())?(n.stopPropagation(),a.filter(":visible").after(e),e.trigger("dragend.h5s"),!1):void 0}),g.add([this,v]).on("dragover.h5s dragenter.h5s",function(r){if(p(o,t(e).parent())){if(r.preventDefault(),r.originalEvent.dataTransfer.dropEffect="move",g.is(this)){var s=t(this).height();if(i.forcePlaceholderSize&&v.height(n),s>n){var u=s-n,l=t(this).offset().top;if(v.index()t(this).index()&&r.originalEvent.pageY>l+s-u)return!1}e.hide(),v.index()r;r++)n[r]=arguments[r];l(Object.getPrototypeOf(a.prototype),"constructor",this).apply(this,n),this.tag=this.props.tag||app.store.createRecord("tags"),this.name=m.prop(this.tag.name()||""),this.slug=m.prop(this.tag.slug()||""),this.description=m.prop(this.tag.description()||""),this.color=m.prop(this.tag.color()||""),this.isHidden=m.prop(this.tag.isHidden()||!1)}return n(a,t),u(a,[{key:"className",value:function(){return"EditTagModal Modal--small"}},{key:"title",value:function(){return this.name()?i({name:this.name,color:this.color}):"Create Tag"}},{key:"content",value:function(){var t=this;return m("div",{className:"Modal-body"},m("div",{className:"Form"},m("div",{className:"Form-group"},m("label",null,"Name"),m("input",{className:"FormControl",placeholder:"Name",value:this.name(),oninput:function(e){t.name(e.target.value),t.slug(o(e.target.value))}})),m("div",{className:"Form-group"},m("label",null,"Slug"),m("input",{className:"FormControl",value:this.slug(),oninput:m.withAttr("value",this.slug)})),m("div",{className:"Form-group"},m("label",null,"Description"),m("textarea",{className:"FormControl",value:this.description(),oninput:m.withAttr("value",this.description)})),m("div",{className:"Form-group"},m("label",null,"Color"),m("input",{className:"FormControl",placeholder:"#aaaaaa",value:this.color(),oninput:m.withAttr("value",this.color)})),m("div",{className:"Form-group"},m("div",null,m("label",{className:"checkbox"},m("input",{type:"checkbox",value:"1",checked:this.isHidden(),onchange:m.withAttr("checked",this.isHidden)}),"Hide from All Discussions"))),m("div",{className:"Form-group"},r.component({type:"submit",className:"Button Button--primary EditTagModal-save",loading:this.loading,children:"Save Changes"}),this.tag.exists?m("button",{type:"button",className:"Button EditTagModal-delete",onclick:this["delete"].bind(this)},"Delete Tag"):"")))}},{key:"onsubmit",value:function(t){var e=this;t.preventDefault(),this.loading=!0,this.tag.save({name:this.name(),slug:this.slug(),description:this.description(),color:this.color(),isHidden:this.isHidden()}).then(function(){return e.hide()},function(){e.loading=!1,m.redraw()})}},{key:"delete",value:function(){confirm("Are you sure you want to delete this tag? The tag's discussions will NOT be deleted.")&&(this.tag["delete"]().then(function(){return m.redraw()}),this.hide())}}]),a}(a),t("default",s)}}}),System.register("flarum/tags/components/TagSettingsModal",["flarum/components/SettingsModal"],function(t){"use strict";function e(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function n(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function, not "+typeof e);t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,enumerable:!1,writable:!0,configurable:!0}}),e&&(Object.setPrototypeOf?Object.setPrototypeOf(t,e):t.__proto__=e)}var a,r,o=function(){function t(t,e){for(var n=0;n li").map(function(){return{id:$(this).data("id"),children:$(this).find("li").map(function(){return $(this).data("id")}).get()}}).get();a.forEach(function(t,e){var n=app.store.getById("tags",t.id);n.pushData({attributes:{position:e,isChild:!1},relationships:{parent:null}}),t.children.forEach(function(t,e){app.store.getById("tags",t).pushData({attributes:{position:e,isChild:!0},relationships:{parent:n}})})}),app.request({url:app.forum.attribute("apiUrl")+"/tags/order",method:"POST",data:{order:a}}),m.redraw.strategy("all"),m.redraw()})}}]),r}(r),t("default",c)}}}); \ No newline at end of file +!function(t,e){"function"==typeof define&&define.amd?define(["jquery"],e):"object"==typeof exports?module.exports=e(require("jquery")):t.sortable=e(t.jQuery)}(this,function(t){"use strict";var e,n,a=t(),r=[],o=function(t){t.off("dragstart.h5s"),t.off("dragend.h5s"),t.off("selectstart.h5s"),t.off("dragover.h5s"),t.off("dragenter.h5s"),t.off("drop.h5s")},i=function(t){t.off("dragover.h5s"),t.off("dragenter.h5s"),t.off("drop.h5s")},s=function(t,e){t.dataTransfer.effectAllowed="move",t.dataTransfer.setData("text",""),t.dataTransfer.setDragImage&&t.dataTransfer.setDragImage(e.item,e.x,e.y)},u=function(t,e){return e.x||(e.x=parseInt(t.pageX-e.draggedItem.offset().left)),e.y||(e.y=parseInt(t.pageY-e.draggedItem.offset().top)),e},l=function(t){return{item:t[0],draggedItem:t}},c=function(t,e){var n=l(e);n=u(t,n),s(t,n)},d=function(t,e){return"undefined"==typeof t?e:t},f=function(t){t.removeData("opts"),t.removeData("connectWith"),t.removeData("items"),t.removeAttr("aria-dropeffect")},m=function(t){t.removeAttr("aria-grabbed"),t.removeAttr("draggable"),t.removeAttr("role")},p=function(t,e){return t[0]===e[0]?!0:void 0!==t.data("connectWith")?t.data("connectWith")===e.data("connectWith"):!1},g=function(t){var e=t.data("opts")||{},n=t.children(e.items),a=e.handle?n.find(e.handle):n;i(t),f(t),a.off("mousedown.h5s"),o(n),m(n)},h=function(e){var n=e.data("opts"),a=e.children(n.items),r=n.handle?a.find(n.handle):a;e.attr("aria-dropeffect","move"),r.attr("draggable","true"),"function"!=typeof document.createElement("span").dragDrop||n.disableIEFix||r.on("mousedown.h5s",function(){-1!==a.index(this)?this.dragDrop():t(this).parents(n.items)[0].dragDrop()})},v=function(t){var e=t.data("opts"),n=t.children(e.items),a=e.handle?n.find(e.handle):n;t.attr("aria-dropeffect","none"),a.attr("draggable",!1),a.off("mousedown.h5s")},b=function(t){var e=t.data("opts"),n=t.children(e.items),a=e.handle?n.find(e.handle):n;o(n),a.off("mousedown.h5s"),i(t)},y=function(o,i){var u=t(o),l=String(i);return i=t.extend({connectWith:!1,placeholder:null,dragImage:null,disableIEFix:!1,placeholderClass:"sortable-placeholder",draggingClass:"sortable-dragging"},i),u.each(function(){var o=t(this);if(/enable|disable|destroy/.test(l))return void y[l](o);i=d(o.data("opts"),i),o.data("opts",i),b(o);var u,f,m,g=o.children(i.items),v=null===i.placeholder?t("<"+(/^ul|ol$/i.test(this.tagName)?"li":"div")+' class="'+i.placeholderClass+'"/>'):t(i.placeholder).addClass(i.placeholderClass);if(!o.attr("data-sortable-id")){var T=r.length;r[T]=o,o.attr("data-sortable-id",T),g.attr("data-item-sortable-id",T)}o.data("items",i.items),a=a.add(v),i.connectWith&&o.data("connectWith",i.connectWith),h(o),g.attr("role","option"),g.attr("aria-grabbed","false"),g.on("dragstart.h5s",function(a){a.stopImmediatePropagation(),i.dragImage?(s(a.originalEvent,{item:i.dragImage,x:0,y:0}),console.log("WARNING: dragImage option is deprecated and will be removed in the future!")):c(a.originalEvent,t(this),i.dragImage),e=t(this),e.addClass(i.draggingClass),e.attr("aria-grabbed","true"),u=e.index(),n=e.height(),f=t(this).parent(),e.parent().triggerHandler("sortstart",{item:e,startparent:f})}),g.on("dragend.h5s",function(){e&&(e.removeClass(i.draggingClass),e.attr("aria-grabbed","false"),e.show(),a.detach(),m=t(this).parent(),e.parent().triggerHandler("sortstop",{item:e,startparent:f}),(u!==e.index()||f.get(0)!==m.get(0))&&e.parent().triggerHandler("sortupdate",{item:e,index:m.children(m.data("items")).index(e),oldindex:g.index(e),elementIndex:e.index(),oldElementIndex:u,startparent:f,endparent:m}),e=null,n=null)}),t(this).add([v]).on("drop.h5s",function(n){return p(o,t(e).parent())?(n.stopPropagation(),a.filter(":visible").after(e),e.trigger("dragend.h5s"),!1):void 0}),g.add([this,v]).on("dragover.h5s dragenter.h5s",function(r){if(p(o,t(e).parent())){if(r.preventDefault(),r.originalEvent.dataTransfer.dropEffect="move",g.is(this)){var s=t(this).height();if(i.forcePlaceholderSize&&v.height(n),s>n){var u=s-n,l=t(this).offset().top;if(v.index()t(this).index()&&r.originalEvent.pageY>l+s-u)return!1}e.hide(),v.index()r;r++)n[r]=arguments[r];l(Object.getPrototypeOf(a.prototype),"constructor",this).apply(this,n),this.tag=this.props.tag||app.store.createRecord("tags"),this.name=m.prop(this.tag.name()||""),this.slug=m.prop(this.tag.slug()||""),this.description=m.prop(this.tag.description()||""),this.color=m.prop(this.tag.color()||""),this.isHidden=m.prop(this.tag.isHidden()||!1)}return n(a,t),u(a,[{key:"className",value:function(){return"EditTagModal Modal--small"}},{key:"title",value:function(){return this.name()?i({name:this.name,color:this.color}):"Create Tag"}},{key:"content",value:function(){var t=this;return m("div",{className:"Modal-body"},m("div",{className:"Form"},m("div",{className:"Form-group"},m("label",null,"Name"),m("input",{className:"FormControl",placeholder:"Name",value:this.name(),oninput:function(e){t.name(e.target.value),t.slug(o(e.target.value))}})),m("div",{className:"Form-group"},m("label",null,"Slug"),m("input",{className:"FormControl",value:this.slug(),oninput:m.withAttr("value",this.slug)})),m("div",{className:"Form-group"},m("label",null,"Description"),m("textarea",{className:"FormControl",value:this.description(),oninput:m.withAttr("value",this.description)})),m("div",{className:"Form-group"},m("label",null,"Color"),m("input",{className:"FormControl",placeholder:"#aaaaaa",value:this.color(),oninput:m.withAttr("value",this.color)})),m("div",{className:"Form-group"},m("div",null,m("label",{className:"checkbox"},m("input",{type:"checkbox",value:"1",checked:this.isHidden(),onchange:m.withAttr("checked",this.isHidden)}),"Hide from All Discussions"))),m("div",{className:"Form-group"},r.component({type:"submit",className:"Button Button--primary EditTagModal-save",loading:this.loading,children:"Save Changes"}),this.tag.exists?m("button",{type:"button",className:"Button EditTagModal-delete",onclick:this["delete"].bind(this)},"Delete Tag"):"")))}},{key:"onsubmit",value:function(t){var e=this;t.preventDefault(),this.loading=!0,this.tag.save({name:this.name(),slug:this.slug(),description:this.description(),color:this.color(),isHidden:this.isHidden()}).then(function(){return e.hide()},function(){e.loading=!1,m.redraw()})}},{key:"delete",value:function(){confirm("Are you sure you want to delete this tag? The tag's discussions will NOT be deleted.")&&(this.tag["delete"]().then(function(){return m.redraw()}),this.hide())}}]),a}(a),t("default",s)}}}),System.register("flarum/tags/components/TagSettingsModal",["flarum/components/SettingsModal"],function(t){"use strict";function e(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function n(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function, not "+typeof e);t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,enumerable:!1,writable:!0,configurable:!0}}),e&&(Object.setPrototypeOf?Object.setPrototypeOf(t,e):t.__proto__=e)}var a,r,o=function(){function t(t,e){for(var n=0;n li").map(function(){return{id:$(this).data("id"),children:$(this).find("li").map(function(){return $(this).data("id")}).get()}}).get();a.forEach(function(t,e){var n=app.store.getById("tags",t.id);n.pushData({attributes:{position:e,isChild:!1},relationships:{parent:null}}),t.children.forEach(function(t,e){app.store.getById("tags",t).pushData({attributes:{position:e,isChild:!0},relationships:{parent:n}})})}),app.request({url:app.forum.attribute("apiUrl")+"/tags/order",method:"POST",data:{order:a}}),m.redraw.strategy("all"),m.redraw()})}}]),r}(r),t("default",c)}}}); \ No newline at end of file diff --git a/extensions/tags/js/admin/src/addTagsPane.js b/extensions/tags/js/admin/src/addTagsPane.js index bcad1eaf3..980410b49 100644 --- a/extensions/tags/js/admin/src/addTagsPane.js +++ b/extensions/tags/js/admin/src/addTagsPane.js @@ -2,7 +2,7 @@ import { extend } from 'flarum/extend'; import AdminNav from 'flarum/components/AdminNav'; import AdminLinkButton from 'flarum/components/AdminLinkButton'; -import TagsPage from 'tags/components/TagsPage'; +import TagsPage from 'flarum/tags/components/TagsPage'; export default function() { app.routes.tags = {path: '/tags', component: TagsPage.component()}; diff --git a/extensions/tags/js/admin/src/addTagsPermissionScope.js b/extensions/tags/js/admin/src/addTagsPermissionScope.js index 05ad53c4d..ebce05198 100644 --- a/extensions/tags/js/admin/src/addTagsPermissionScope.js +++ b/extensions/tags/js/admin/src/addTagsPermissionScope.js @@ -4,9 +4,9 @@ import PermissionDropdown from 'flarum/components/PermissionDropdown'; import Dropdown from 'flarum/components/Dropdown'; import Button from 'flarum/components/Button'; -import tagLabel from 'tags/helpers/tagLabel'; -import tagIcon from 'tags/helpers/tagIcon'; -import sortTags from 'tags/utils/sortTags'; +import tagLabel from 'flarum/tags/helpers/tagLabel'; +import tagIcon from 'flarum/tags/helpers/tagIcon'; +import sortTags from 'flarum/tags/utils/sortTags'; export default function() { extend(PermissionGrid.prototype, 'scopeItems', items => { diff --git a/extensions/tags/js/admin/src/components/EditTagModal.js b/extensions/tags/js/admin/src/components/EditTagModal.js index 2db3ad2a1..082aeca37 100644 --- a/extensions/tags/js/admin/src/components/EditTagModal.js +++ b/extensions/tags/js/admin/src/components/EditTagModal.js @@ -2,7 +2,7 @@ import Modal from 'flarum/components/Modal'; import Button from 'flarum/components/Button'; import { slug } from 'flarum/utils/string'; -import tagLabel from 'tags/helpers/tagLabel'; +import tagLabel from 'flarum/tags/helpers/tagLabel'; /** * The `EditTagModal` component shows a modal dialog which allows the user diff --git a/extensions/tags/js/admin/src/components/TagsPage.js b/extensions/tags/js/admin/src/components/TagsPage.js index 8e7e76c86..577f6d1ad 100644 --- a/extensions/tags/js/admin/src/components/TagsPage.js +++ b/extensions/tags/js/admin/src/components/TagsPage.js @@ -1,10 +1,10 @@ import Component from 'flarum/Component'; import Button from 'flarum/components/Button'; -import EditTagModal from 'tags/components/EditTagModal'; -import TagSettingsModal from 'tags/components/TagSettingsModal'; -import tagIcon from 'tags/helpers/tagIcon'; -import sortTags from 'tags/utils/sortTags'; +import EditTagModal from 'flarum/tags/components/EditTagModal'; +import TagSettingsModal from 'flarum/tags/components/TagSettingsModal'; +import tagIcon from 'flarum/tags/helpers/tagIcon'; +import sortTags from 'flarum/tags/utils/sortTags'; function tagItem(tag) { return ( diff --git a/extensions/tags/js/admin/src/main.js b/extensions/tags/js/admin/src/main.js index ad75571f8..c80fb06b4 100644 --- a/extensions/tags/js/admin/src/main.js +++ b/extensions/tags/js/admin/src/main.js @@ -1,8 +1,8 @@ -import Tag from 'tags/models/Tag'; -import addTagsPermissionScope from 'tags/addTagsPermissionScope'; -import addTagPermission from 'tags/addTagPermission'; -import addTagsPane from 'tags/addTagsPane'; -import addTagsHomePageOption from 'tags/addTagsHomePageOption'; +import Tag from 'flarum/tags/models/Tag'; +import addTagsPermissionScope from 'flarum/tags/addTagsPermissionScope'; +import addTagPermission from 'flarum/tags/addTagPermission'; +import addTagsPane from 'flarum/tags/addTagsPane'; +import addTagsHomePageOption from 'flarum/tags/addTagsHomePageOption'; app.initializers.add('tags', app => { app.store.models.tags = Tag;