Upgraded tags datatype to use jQuery tags input plugin gor a nicer UI (still works the same under the hood)

This commit is contained in:
Matt@MBP13-PC
2012-07-23 10:05:29 -01:00
parent 9f60e49a32
commit c51267136c
6 changed files with 414 additions and 102 deletions

View File

@@ -40,6 +40,10 @@
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<TargetFrameworkProfile />
<UseIISExpress>true</UseIISExpress>
<IISExpressSSLPort />
<IISExpressAnonymousAuthentication />
<IISExpressWindowsAuthentication />
<IISExpressUseClassicPipelineMode />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<OutputPath>bin\</OutputPath>
@@ -345,6 +349,11 @@
<Content Include="umbraco\webservices\api\MemberService.asmx" />
<Content Include="umbraco\webservices\api\StylesheetService.asmx" />
<Content Include="umbraco\webservices\api\TemplateService.asmx" />
<Content Include="umbraco_client\tags\css\jquery.tagsinput.css" />
<Content Include="umbraco_client\tags\js\jquery.tagsinput.js" />
<Content Include="umbraco_client\tags\js\jquery.tagsinput.min.js">
<DependentUpon>jquery.tagsinput.js</DependentUpon>
</Content>
<Content Include="umbraco_client\tinymce3\langs\en.js" />
<Content Include="umbraco_client\tinymce3\langs\he.js" />
<Content Include="umbraco_client\tinymce3\langs\ja.js" />
@@ -1789,6 +1798,7 @@
<Folder Include="masterpages\" />
<Folder Include="media\" />
<Folder Include="scripts\" />
<Folder Include="umbraco_client\tags\images\" />
<Folder Include="usercontrols\" />
<Folder Include="xslt\" />
</ItemGroup>

View File

@@ -0,0 +1,7 @@
div.tagsinput { border:1px solid #CCC; background: #FFF; padding:5px; width:300px; height:100px; overflow-y: auto;}
div.tagsinput span.tag { border: 1px solid #a5d24a; -moz-border-radius:2px; -webkit-border-radius:2px; display: block; float: left; padding: 5px; text-decoration:none; background: #cde69c; color: #638421; margin-right: 5px; margin-bottom:5px;font-family: helvetica; font-size:13px;}
div.tagsinput span.tag a { font-weight: bold; color: #82ad2b; text-decoration:none; font-size: 11px; }
div.tagsinput input { width:80px; margin:0px; font-family: helvetica; font-size: 13px; border:1px solid transparent; padding:5px; background: transparent; color: #000; outline:0px; margin-right:5px; margin-bottom:5px; }
div.tagsinput div { display:block; float: left; }
.tags_clear { clear: both; width: 100%; height: 0px; }
.not_valid {background: #FBD8DB !important; color: #90111A !important;}

View File

@@ -0,0 +1,354 @@
/*
jQuery Tags Input Plugin 1.3.3
Copyright (c) 2011 XOXCO, Inc
Documentation for this plugin lives here:
http://xoxco.com/clickable/jquery-tags-input
Licensed under the MIT license:
http://www.opensource.org/licenses/mit-license.php
ben@xoxco.com
*/
(function($) {
var delimiter = new Array();
var tags_callbacks = new Array();
$.fn.doAutosize = function(o){
var minWidth = $(this).data('minwidth'),
maxWidth = $(this).data('maxwidth'),
val = '',
input = $(this),
testSubject = $('#'+$(this).data('tester_id'));
if (val === (val = input.val())) {return;}
// Enter new content into testSubject
var escaped = val.replace(/&/g, '&amp;').replace(/\s/g,' ').replace(/</g, '&lt;').replace(/>/g, '&gt;');
testSubject.html(escaped);
// Calculate new width + whether to change
var testerWidth = testSubject.width(),
newWidth = (testerWidth + o.comfortZone) >= minWidth ? testerWidth + o.comfortZone : minWidth,
currentWidth = input.width(),
isValidWidthChange = (newWidth < currentWidth && newWidth >= minWidth)
|| (newWidth > minWidth && newWidth < maxWidth);
// Animate width
if (isValidWidthChange) {
input.width(newWidth);
}
};
$.fn.resetAutosize = function(options){
// alert(JSON.stringify(options));
var minWidth = $(this).data('minwidth') || options.minInputWidth || $(this).width(),
maxWidth = $(this).data('maxwidth') || options.maxInputWidth || ($(this).closest('.tagsinput').width() - options.inputPadding),
val = '',
input = $(this),
testSubject = $('<tester/>').css({
position: 'absolute',
top: -9999,
left: -9999,
width: 'auto',
fontSize: input.css('fontSize'),
fontFamily: input.css('fontFamily'),
fontWeight: input.css('fontWeight'),
letterSpacing: input.css('letterSpacing'),
whiteSpace: 'nowrap'
}),
testerId = $(this).attr('id')+'_autosize_tester';
if(! $('#'+testerId).length > 0){
testSubject.attr('id', testerId);
testSubject.appendTo('body');
}
input.data('minwidth', minWidth);
input.data('maxwidth', maxWidth);
input.data('tester_id', testerId);
input.css('width', minWidth);
};
$.fn.addTag = function(value,options) {
options = jQuery.extend({focus:false,callback:true},options);
this.each(function() {
var id = $(this).attr('id');
var tagslist = $(this).val().split(delimiter[id]);
if (tagslist[0] == '') {
tagslist = new Array();
}
value = jQuery.trim(value);
if (options.unique) {
var skipTag = $(this).tagExist(value);
if(skipTag == true) {
//Marks fake input as not_valid to let styling it
$('#'+id+'_tag').addClass('not_valid');
}
} else {
var skipTag = false;
}
if (value !='' && skipTag != true) {
$('<span>').addClass('tag').append(
$('<span>').text(value).append('&nbsp;&nbsp;'),
$('<a>', {
href : '#',
title : 'Removing tag',
text : 'x'
}).click(function () {
return $('#' + id).removeTag(escape(value));
})
).insertBefore('#' + id + '_addTag');
tagslist.push(value);
$('#'+id+'_tag').val('');
if (options.focus) {
$('#'+id+'_tag').focus();
} else {
$('#'+id+'_tag').blur();
}
$.fn.tagsInput.updateTagsField(this,tagslist);
if (options.callback && tags_callbacks[id] && tags_callbacks[id]['onAddTag']) {
var f = tags_callbacks[id]['onAddTag'];
f.call(this, value);
}
if(tags_callbacks[id] && tags_callbacks[id]['onChange'])
{
var i = tagslist.length;
var f = tags_callbacks[id]['onChange'];
f.call(this, $(this), tagslist[i-1]);
}
}
});
return false;
};
$.fn.removeTag = function(value) {
value = unescape(value);
this.each(function() {
var id = $(this).attr('id');
var old = $(this).val().split(delimiter[id]);
$('#'+id+'_tagsinput .tag').remove();
str = '';
for (i=0; i< old.length; i++) {
if (old[i]!=value) {
str = str + delimiter[id] +old[i];
}
}
$.fn.tagsInput.importTags(this,str);
if (tags_callbacks[id] && tags_callbacks[id]['onRemoveTag']) {
var f = tags_callbacks[id]['onRemoveTag'];
f.call(this, value);
}
});
return false;
};
$.fn.tagExist = function(val) {
var id = $(this).attr('id');
var tagslist = $(this).val().split(delimiter[id]);
return (jQuery.inArray(val, tagslist) >= 0); //true when tag exists, false when not
};
// clear all existing tags and import new ones from a string
$.fn.importTags = function(str) {
id = $(this).attr('id');
$('#'+id+'_tagsinput .tag').remove();
$.fn.tagsInput.importTags(this,str);
}
$.fn.tagsInput = function(options) {
var settings = jQuery.extend({
interactive:true,
defaultText:'add a tag',
minChars:0,
width:'300px',
height:'100px',
autocomplete: {selectFirst: false },
'hide':true,
'delimiter':',',
'unique':true,
removeWithBackspace:true,
placeholderColor:'#666666',
autosize: true,
comfortZone: 20,
inputPadding: 6*2
},options);
this.each(function() {
if (settings.hide) {
$(this).hide();
}
var id = $(this).attr('id');
if (!id || delimiter[$(this).attr('id')]) {
id = $(this).attr('id', 'tags' + new Date().getTime()).attr('id');
}
var data = jQuery.extend({
pid:id,
real_input: '#'+id,
holder: '#'+id+'_tagsinput',
input_wrapper: '#'+id+'_addTag',
fake_input: '#'+id+'_tag'
},settings);
delimiter[id] = data.delimiter;
if (settings.onAddTag || settings.onRemoveTag || settings.onChange) {
tags_callbacks[id] = new Array();
tags_callbacks[id]['onAddTag'] = settings.onAddTag;
tags_callbacks[id]['onRemoveTag'] = settings.onRemoveTag;
tags_callbacks[id]['onChange'] = settings.onChange;
}
var markup = '<div id="'+id+'_tagsinput" class="tagsinput"><div id="'+id+'_addTag">';
if (settings.interactive) {
markup = markup + '<input id="'+id+'_tag" value="" data-default="'+settings.defaultText+'" />';
}
markup = markup + '</div><div class="tags_clear"></div></div>';
$(markup).insertAfter(this);
$(data.holder).css('width',settings.width);
$(data.holder).css('min-height',settings.height);
$(data.holder).css('height','100%');
if ($(data.real_input).val()!='') {
$.fn.tagsInput.importTags($(data.real_input),$(data.real_input).val());
}
if (settings.interactive) {
$(data.fake_input).val($(data.fake_input).attr('data-default'));
$(data.fake_input).css('color',settings.placeholderColor);
$(data.fake_input).resetAutosize(settings);
$(data.holder).bind('click',data,function(event) {
$(event.data.fake_input).focus();
});
$(data.fake_input).bind('focus',data,function(event) {
if ($(event.data.fake_input).val()==$(event.data.fake_input).attr('data-default')) {
$(event.data.fake_input).val('');
}
$(event.data.fake_input).css('color','#000000');
});
if (settings.autocomplete_url != undefined) {
autocomplete_options = {source: settings.autocomplete_url};
for (attrname in settings.autocomplete) {
autocomplete_options[attrname] = settings.autocomplete[attrname];
}
if (jQuery.Autocompleter !== undefined) {
$(data.fake_input).autocomplete(settings.autocomplete_url, settings.autocomplete);
$(data.fake_input).bind('result',data,function(event,data,formatted) {
if (data) {
$('#'+id).addTag(data[0] + "",{focus:true,unique:(settings.unique)});
}
});
} else if (jQuery.ui.autocomplete !== undefined) {
$(data.fake_input).autocomplete(autocomplete_options);
$(data.fake_input).bind('autocompleteselect',data,function(event,ui) {
$(event.data.real_input).addTag(ui.item.value,{focus:true,unique:(settings.unique)});
return false;
});
}
} else {
// if a user tabs out of the field, create a new tag
// this is only available if autocomplete is not used.
$(data.fake_input).bind('blur',data,function(event) {
var d = $(this).attr('data-default');
if ($(event.data.fake_input).val()!='' && $(event.data.fake_input).val()!=d) {
if( (event.data.minChars <= $(event.data.fake_input).val().length) && (!event.data.maxChars || (event.data.maxChars >= $(event.data.fake_input).val().length)) )
$(event.data.real_input).addTag($(event.data.fake_input).val(),{focus:true,unique:(settings.unique)});
} else {
$(event.data.fake_input).val($(event.data.fake_input).attr('data-default'));
$(event.data.fake_input).css('color',settings.placeholderColor);
}
return false;
});
}
// if user types a comma, create a new tag
$(data.fake_input).bind('keypress',data,function(event) {
if (event.which==event.data.delimiter.charCodeAt(0) || event.which==13 ) {
event.preventDefault();
if( (event.data.minChars <= $(event.data.fake_input).val().length) && (!event.data.maxChars || (event.data.maxChars >= $(event.data.fake_input).val().length)) )
$(event.data.real_input).addTag($(event.data.fake_input).val(),{focus:true,unique:(settings.unique)});
$(event.data.fake_input).resetAutosize(settings);
return false;
} else if (event.data.autosize) {
$(event.data.fake_input).doAutosize(settings);
}
});
//Delete last tag on backspace
data.removeWithBackspace && $(data.fake_input).bind('keydown', function(event)
{
if(event.keyCode == 8 && $(this).val() == '')
{
event.preventDefault();
var last_tag = $(this).closest('.tagsinput').find('.tag:last').text();
var id = $(this).attr('id').replace(/_tag$/, '');
last_tag = last_tag.replace(/[\s]+x$/, '');
$('#' + id).removeTag(escape(last_tag));
$(this).trigger('focus');
}
});
$(data.fake_input).blur();
//Removes the not_valid class when user changes the value of the fake input
if(data.unique) {
$(data.fake_input).keydown(function(event){
if(event.keyCode == 8 || String.fromCharCode(event.which).match(/\w+|[áéíóúÁÉÍÓÚñÑ,/]+/)) {
$(this).removeClass('not_valid');
}
});
}
} // if settings.interactive
});
return this;
};
$.fn.tagsInput.updateTagsField = function(obj,tagslist) {
var id = $(obj).attr('id');
$(obj).val(tagslist.join(delimiter[id]));
};
$.fn.tagsInput.importTags = function(obj,val) {
$(obj).val('');
var id = $(obj).attr('id');
var tags = val.split(delimiter[id]);
for (i=0; i<tags.length; i++) {
$(obj).addTag(tags[i],{focus:false,callback:false});
}
if(tags_callbacks[id] && tags_callbacks[id]['onChange'])
{
var f = tags_callbacks[id]['onChange'];
f.call(obj, obj, tags[i]);
}
};
})(jQuery);

File diff suppressed because one or more lines are too long

View File

@@ -2,6 +2,7 @@
using System.Collections.Generic;
using System.Linq;
using System.Web;
using System.Web.Script.Serialization;
using System.Web.Services;
using umbraco.DataLayer;
using umbraco.BusinessLogic;
@@ -21,10 +22,17 @@ namespace umbraco.presentation.umbraco.webservices
{
legacyAjaxCalls.Authorize();
context.Response.ContentType = "text/plain";
string format = context.Request.QueryString["format"];
bool returnJson = format == "json";
context.Response.ContentType = returnJson ? "application/json" : "text/plain";
int count = 2;
string prefixText = context.Request.QueryString["q"];
if (string.IsNullOrEmpty(prefixText))
prefixText = context.Request.QueryString["term"];
string group = context.Request.QueryString["group"];
string id = context.Request.QueryString["id"];
@@ -61,13 +69,15 @@ namespace umbraco.presentation.umbraco.webservices
);
}
var tagList = new List<string>();
while (rr.Read())
{
context.Response.Write(rr.GetString("tag") + Environment.NewLine);
tagList.Add(rr.GetString("tag"));
}
context.Response.Write(returnJson
? new JavaScriptSerializer().Serialize(tagList)
: string.Join(Environment.NewLine, tagList));
}
catch (Exception ex)
{

View File

@@ -1,5 +1,6 @@
using System;
using System.Collections;
using System.Linq;
using System.Web.UI;
using System.Web.UI.WebControls;
using umbraco.BusinessLogic;
@@ -24,7 +25,6 @@ namespace umbraco.editorControls.tags
_group = Prevalues["group"].ToString();
}
public CheckBoxList tagCheckList = new CheckBoxList();
public TextBox tagBox = new TextBox();
@@ -32,49 +32,32 @@ namespace umbraco.editorControls.tags
public void Save()
{
CheckBoxList items = tagCheckList;
int _nodeID;
int.TryParse(_data.NodeId.ToString(), out _nodeID);
string allTags = "";
int tagId = 0;
//first clear out all items associated with this ID...
umbraco.cms.businesslogic.Tags.Tag.RemoveTagsFromNode(_nodeID, _group);
//and now we add them again...
foreach (ListItem li in items.Items)
var items = tagBox.Text.Trim().Split(',');
foreach (var item in items)
{
if (li.Selected)
var tagName = item.Trim();
if(string.IsNullOrEmpty(tagName))
continue;
var tagId = cms.businesslogic.Tags.Tag.GetTagId(tagName, _group);
if(tagId == 0)
tagId = cms.businesslogic.Tags.Tag.AddTag(tagName, _group);
if (tagId > 0)
{
if (li.Value == "0")
{
// NH 4.7.1 if a tag doesn't have an id associated we'll do a 2nd check in case the XHR request went wrong
// from Codeplex 30151
tagId = cms.businesslogic.Tags.Tag.GetTagId(li.Text, _group);
if (tagId == 0)
tagId = cms.businesslogic.Tags.Tag.AddTag(li.Text, _group);
li.Value = tagId.ToString();
}
else
{
int.TryParse(li.Value, out tagId);
}
if (tagId > 0)
{
umbraco.cms.businesslogic.Tags.Tag.AssociateTagToNode(_nodeID, tagId);
tagId = 0;
allTags += "," + li.Text;
}
umbraco.cms.businesslogic.Tags.Tag.AssociateTagToNode(_nodeID, tagId);
}
}
//and just in case, we'll save the tags as plain text on the node itself...
_data.Value = allTags.Trim().Trim(',');
_data.Value = tagBox.Text;
}
public bool ShowLabel
@@ -87,44 +70,6 @@ namespace umbraco.editorControls.tags
get { return false; }
}
public void tagBoxTextChange(object sender, EventArgs e)
{
try
{
if (tagBox.Text.Trim().Length > 0)
{
CheckBoxList items = tagCheckList;
string[] tags = tagBox.Text.Trim().Trim(',').Split(',');
for (int i = 0; i < tags.Length; i++)
{
//if not found we'll get zero and handle that onsave instead...
int id = getTagId(tags[i], _group);
//we don't want 2 of a kind...
if (items.Items.FindByText(tags[i].Trim()) == null)
{
ListItem li = new ListItem(tags[i], id.ToString());
li.Selected = true;
items.Items.Add(li);
}
}
//reset the textbox
tagBox.Text = "";
ScriptManager.GetCurrent(Page).SetFocus(tagBox);
}
}
catch (Exception ex)
{
Log.Add(LogTypes.Debug, -1, ex.ToString());
}
}
[Obsolete("use the umbraco.cms.businesslogic.Tags.Tag class instead")]
public int getTagId(string tag, string group)
@@ -137,9 +82,14 @@ namespace umbraco.editorControls.tags
{
base.OnInit(e);
ClientDependencyLoader.Instance.RegisterDependency("Application/JQuery/jquery.autocomplete.js", "UmbracoClient", ClientDependencyType.Javascript);
//ClientDependencyLoader.Instance.RegisterDependency("Application/JQuery/jquery.autocomplete.js", "UmbracoClient", ClientDependencyType.Javascript);
ClientDependencyLoader.Instance.RegisterDependency("ui/ui-lightness/jquery-ui.custom.css", "UmbracoClient", ClientDependencyType.Css);
ClientDependencyLoader.Instance.RegisterDependency("css/umbracoGui.css", "UmbracoRoot", ClientDependencyType.Css);
ClientDependencyLoader.Instance.RegisterDependency("tags/css/jquery.tagsinput.css", "UmbracoClient", ClientDependencyType.Css);
ClientDependencyLoader.Instance.RegisterDependency("tags/js/jquery.tagsinput.min.js", "UmbracoClient", ClientDependencyType.Javascript);
string _alias = ((umbraco.cms.businesslogic.datatype.DefaultData)_data).PropertyId.ToString();
//making sure that we have a ID for context
@@ -163,41 +113,23 @@ namespace umbraco.editorControls.tags
}
}
tagBox.ID = "tagBox_" + _alias;
tagBox.AutoPostBack = true;
tagBox.AutoCompleteType = AutoCompleteType.Disabled;
tagBox.TextChanged += new System.EventHandler(this.tagBoxTextChange);
tagBox.CssClass = "umbEditorTextField";
Button tagButton = new Button();
tagButton.Click += new System.EventHandler(this.tagBoxTextChange);
tagButton.Text = "tag";
tagCheckList.ID = "tagCheckList_" + _alias;
tagBox.ID = "tagBox2_" + _alias;
tagBox.CssClass = "umbEditorTextField umbTagBox";
if (!String.IsNullOrEmpty(pageId))
{
var tags = umbraco.cms.businesslogic.Tags.Tag.GetTags(int.Parse(pageId), _group);
foreach (var t in tags)
{
ListItem li = new ListItem(t.TagCaption, t.Id.ToString());
li.Selected = true;
tagCheckList.Items.Add(li);
}
tagBox.Text = string.Join(",", tags.Select(x => x.TagCaption));
}
this.ContentTemplateContainer.Controls.Add(tagBox);
this.ContentTemplateContainer.Controls.Add(tagButton);
this.ContentTemplateContainer.Controls.Add(tagCheckList);
string tagsAutoCompleteScript =
"jQuery(\"#"
+ tagBox.ClientID + "\").autocomplete(\""
+ umbraco.IO.IOHelper.ResolveUrl(umbraco.IO.SystemDirectories.Umbraco)
+ "/webservices/TagsAutoCompleteHandler.ashx\",{minChars: 2,max: 100, extraParams:{group:\"" + _group + "\",id:\"" + pageId + "\",rnd:\"" + DateTime.Now.Ticks + "\"}}).result(function(e, data){jQuery(\"#" + tagButton.ClientID + "\").trigger('click');});";
"jQuery('.umbTagBox').tagsInput({ width: '400px', defaultText: 'Add a tag', minChars: 2, autocomplete_url: '" +
umbraco.IO.IOHelper.ResolveUrl(umbraco.IO.SystemDirectories.Umbraco)
+ "/webservices/TagsAutoCompleteHandler.ashx?group=" + _group + "&id=" + pageId + "&rnd=" +
DateTime.Now.Ticks + "&format=json' });";
string tagsAutoCompleteInitScript =
@@ -210,10 +142,8 @@ namespace umbraco.editorControls.tags
if (Page.IsPostBack)
{
ScriptManager.RegisterClientScriptBlock(this, GetType(), ClientID + "_tags", tagsAutoCompleteScript, true);
}
}
#endregion