From e1f90dbad95c8bee6ac7ceb3f04f10e9a8a8d91a Mon Sep 17 00:00:00 2001 From: yidashi Date: Tue, 21 Feb 2017 10:37:30 +0800 Subject: [PATCH] =?UTF-8?q?'switcher=E5=A4=A7bug'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/views/article/_form.php | 1 - backend/widgets/grid/SwitcherColumn.php | 2 +- common/widgets/tag/Tag.php | 50 ------------------- common/widgets/tag/TagAsset.php | 23 --------- .../tag/assets/jquery.tagsinput.min.css | 1 - .../tag/assets/jquery.tagsinput.min.js | 1 - 6 files changed, 1 insertion(+), 77 deletions(-) delete mode 100755 common/widgets/tag/Tag.php delete mode 100755 common/widgets/tag/TagAsset.php delete mode 100755 common/widgets/tag/assets/jquery.tagsinput.min.css delete mode 100755 common/widgets/tag/assets/jquery.tagsinput.min.js diff --git a/backend/views/article/_form.php b/backend/views/article/_form.php index ad977728..4cc90e8a 100755 --- a/backend/views/article/_form.php +++ b/backend/views/article/_form.php @@ -10,7 +10,6 @@ /* @var $this yii\web\View */ /* @var $model common\models\Article */ -/* @var $dataModel common\models\ArticleData */ /* @var $moduleModel common\models\ArticleExhibition */ /* @var $form backend\widgets\ActiveForm */ ?> diff --git a/backend/widgets/grid/SwitcherColumn.php b/backend/widgets/grid/SwitcherColumn.php index ec306183..d53b152b 100755 --- a/backend/widgets/grid/SwitcherColumn.php +++ b/backend/widgets/grid/SwitcherColumn.php @@ -11,7 +11,7 @@ class SwitcherColumn extends DataColumn public $reload = 0; - public $route = 'switcher'; + public $route = ['switcher']; public function registerClientScript() { diff --git a/common/widgets/tag/Tag.php b/common/widgets/tag/Tag.php deleted file mode 100755 index ce29d976..00000000 --- a/common/widgets/tag/Tag.php +++ /dev/null @@ -1,50 +0,0 @@ -options['id'] = $this->id; - } - public function run() - { - TagAsset::register($this->view); - $options = array_merge([ - 'height' => '100px', - 'width' => '300px', - 'interactive' => true, - 'defaultText' => '', - 'delimiter' => ' ', // Or a string with a single delimiter. Ex: ';' - 'removeWithBackspace' => true, - 'minChars' => 0, - 'maxChars' => 0, // if not provided there is no limit - 'placeholderColor' => '#666666' - ], $this->clientOptions); - $clientOptions = Json::htmlEncode($options); - $this->view->registerJs(<<id}').tagsInput({$clientOptions}); -JS -); - if($this->hasModel()){ - return Html::activeTextInput($this->model,$this->attribute,$this->options); - }else{ - return Html::textInput($this->name,$this->value,$this->options); - } - } -} \ No newline at end of file diff --git a/common/widgets/tag/TagAsset.php b/common/widgets/tag/TagAsset.php deleted file mode 100755 index 35c31c25..00000000 --- a/common/widgets/tag/TagAsset.php +++ /dev/null @@ -1,23 +0,0 @@ -/g,">");g.html(h);var i=g.width(),j=i+b.comfortZone>=c?i+b.comfortZone:c,k=f.width(),l=k>j&&j>=c||j>c&&d>j;l&&f.width(j)}},a.fn.resetAutosize=function(b){var c=a(this).data("minwidth")||b.minInputWidth||a(this).width(),d=a(this).data("maxwidth")||b.maxInputWidth||a(this).closest(".tagsinput").width()-b.inputPadding,e=a(this),f=a("").css({position:"absolute",top:-9999,left:-9999,width:"auto",fontSize:e.css("fontSize"),fontFamily:e.css("fontFamily"),fontWeight:e.css("fontWeight"),letterSpacing:e.css("letterSpacing"),whiteSpace:"nowrap"}),g=a(this).attr("id")+"_autosize_tester";!a("#"+g).length>0&&(f.attr("id",g),f.appendTo("body")),e.data("minwidth",c),e.data("maxwidth",d),e.data("tester_id",g),e.css("width",c)},a.fn.addTag=function(d,e){return e=jQuery.extend({focus:!1,callback:!0},e),this.each(function(){var f=a(this).attr("id"),g=a(this).val().split(b[f]);if(""==g[0]&&(g=new Array),d=jQuery.trim(d),e.unique){var h=a(this).tagExist(d);1==h&&a("#"+f+"_tag").addClass("not_valid")}else var h=!1;if(""!=d&&1!=h){if(a("").addClass("tag").append(a("").text(d).append("  "),a("",{href:"#",title:"Removing tag",text:"x"}).click(function(){return a("#"+f).removeTag(escape(d))})).insertBefore("#"+f+"_addTag"),g.push(d),a("#"+f+"_tag").val(""),e.focus?a("#"+f+"_tag").focus():a("#"+f+"_tag").blur(),a.fn.tagsInput.updateTagsField(this,g),e.callback&&c[f]&&c[f].onAddTag){var i=c[f].onAddTag;i.call(this,d)}if(c[f]&&c[f].onChange){var j=g.length,i=c[f].onChange;i.call(this,a(this),g[j-1])}}}),!1},a.fn.removeTag=function(d){return d=unescape(d),this.each(function(){var e=a(this).attr("id"),f=a(this).val().split(b[e]);for(a("#"+e+"_tagsinput .tag").remove(),str="",i=0;i=0},a.fn.importTags=function(b){var c=a(this).attr("id");a("#"+c+"_tagsinput .tag").remove(),a.fn.tagsInput.importTags(this,b)},a.fn.tagsInput=function(e){var f=jQuery.extend({interactive:!0,defaultText:"add a tag",minChars:0,width:"300px",height:"100px",autocomplete:{selectFirst:!1},hide:!0,delimiter:",",unique:!0,removeWithBackspace:!0,placeholderColor:"#666666",autosize:!0,comfortZone:20,inputPadding:12},e),g=0;return this.each(function(){if("undefined"==typeof a(this).attr("data-tagsinput-init")){a(this).attr("data-tagsinput-init",!0),f.hide&&a(this).hide();var e=a(this).attr("id");(!e||b[a(this).attr("id")])&&(e=a(this).attr("id","tags"+(new Date).getTime()+g++).attr("id"));var h=jQuery.extend({pid:e,real_input:"#"+e,holder:"#"+e+"_tagsinput",input_wrapper:"#"+e+"_addTag",fake_input:"#"+e+"_tag"},f);b[e]=h.delimiter,(f.onAddTag||f.onRemoveTag||f.onChange)&&(c[e]=new Array,c[e].onAddTag=f.onAddTag,c[e].onRemoveTag=f.onRemoveTag,c[e].onChange=f.onChange);var i='
';if(f.interactive&&(i=i+''),i+='
',a(i).insertAfter(this),a(h.holder).css("width",f.width),a(h.holder).css("min-height",f.height),a(h.holder).css("height",f.height),""!=a(h.real_input).val()&&a.fn.tagsInput.importTags(a(h.real_input),a(h.real_input).val()),f.interactive){if(a(h.fake_input).val(a(h.fake_input).attr("data-default")),a(h.fake_input).css("color",f.placeholderColor),a(h.fake_input).resetAutosize(f),a(h.holder).bind("click",h,function(b){a(b.data.fake_input).focus()}),a(h.fake_input).bind("focus",h,function(b){a(b.data.fake_input).val()==a(b.data.fake_input).attr("data-default")&&a(b.data.fake_input).val(""),a(b.data.fake_input).css("color","#000000")}),void 0!=f.autocomplete_url){autocomplete_options={source:f.autocomplete_url};for(attrname in f.autocomplete)autocomplete_options[attrname]=f.autocomplete[attrname];void 0!==jQuery.Autocompleter?(a(h.fake_input).autocomplete(f.autocomplete_url,f.autocomplete),a(h.fake_input).bind("result",h,function(b,c,d){c&&a("#"+e).addTag(c[0]+"",{focus:!0,unique:f.unique})})):void 0!==jQuery.ui.autocomplete&&(a(h.fake_input).autocomplete(autocomplete_options),a(h.fake_input).bind("autocompleteselect",h,function(b,c){return a(b.data.real_input).addTag(c.item.value,{focus:!0,unique:f.unique}),!1}))}else a(h.fake_input).bind("blur",h,function(b){var c=a(this).attr("data-default");return""!=a(b.data.fake_input).val()&&a(b.data.fake_input).val()!=c?b.data.minChars<=a(b.data.fake_input).val().length&&(!b.data.maxChars||b.data.maxChars>=a(b.data.fake_input).val().length)&&a(b.data.real_input).addTag(a(b.data.fake_input).val(),{focus:!0,unique:f.unique}):(a(b.data.fake_input).val(a(b.data.fake_input).attr("data-default")),a(b.data.fake_input).css("color",f.placeholderColor)),!1});a(h.fake_input).bind("keypress",h,function(b){return d(b)?(b.preventDefault(),b.data.minChars<=a(b.data.fake_input).val().length&&(!b.data.maxChars||b.data.maxChars>=a(b.data.fake_input).val().length)&&a(b.data.real_input).addTag(a(b.data.fake_input).val(),{focus:!0,unique:f.unique}),a(b.data.fake_input).resetAutosize(f),!1):void(b.data.autosize&&a(b.data.fake_input).doAutosize(f))}),h.removeWithBackspace&&a(h.fake_input).bind("keydown",function(b){if(8==b.keyCode&&""==a(this).val()){b.preventDefault();var c=a(this).closest(".tagsinput").find(".tag:last").text(),d=a(this).attr("id").replace(/_tag$/,"");c=c.replace(/[\s]+x$/,""),a("#"+d).removeTag(escape(c)),a(this).trigger("focus")}}),a(h.fake_input).blur(),h.unique&&a(h.fake_input).keydown(function(b){(8==b.keyCode||String.fromCharCode(b.which).match(/\w+|[áéíóúÁÉÍÓÚñÑ,/]+/))&&a(this).removeClass("not_valid")})}}}),this},a.fn.tagsInput.updateTagsField=function(c,d){var e=a(c).attr("id");a(c).val(d.join(b[e]))},a.fn.tagsInput.importTags=function(d,e){a(d).val("");var f=a(d).attr("id"),g=e.split(b[f]);for(i=0;i