Skip to content

Commit

Permalink
Item1918: preparing TagsPlugins compatibility with 1.1
Browse files Browse the repository at this point in the history 
git-svn-id: http://svn.foswiki.org/trunk/TagsPlugin@9990 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
  • Loading branch information
OliverKrueger authored and OliverKrueger committed Nov 16, 2010
1 parent d9018bd commit 2a96c6a
Show file tree
Hide file tree
Showing 4 changed files with 34 additions and 25 deletions.
48 changes: 25 additions & 23 deletions pub/System/TagsPlugin/tagsplugin-base.js
View file
Expand Up @@ -5,15 +5,17 @@
jQuery.tagsplugin.tag = function(tag,options) {
var settings = $.extend({
tag: tag,
user: foswiki.wikiName,
item: foswiki.web+"."+foswiki.topic,
user: foswiki.WIKINAME,
item: foswiki.WEB+"."+foswiki.TOPIC,
public: 1,
warn_unchanged: false,
completed: function(){}
},options||{});

alert("item: "+settings.item);

$.ajax(
{ url: foswiki.scriptUrl+'/rest/TagsPlugin/tag',
{ url: foswiki.SCRIPTURL+'/rest/TagsPlugin/tag',
type: "POST",
data: { tag : settings.tag,
item : settings.item,
Expand Down Expand Up @@ -53,14 +55,14 @@
jQuery.tagsplugin.untag = function(tag,public,options) {
var settings = $.extend({
tag: tag,
user: foswiki.wikiName,
item: foswiki.web+"."+foswiki.topic,
user: foswiki.WIKINAME,
item: foswiki.WEB+"."+foswiki.TOPIC,
warn_unchanged: false,
completed: function(){}
},options||{});

$.ajax(
{ url: foswiki.scriptUrl+'/rest/TagsPlugin/untag',
{ url: foswiki.SCRIPTURL+'/rest/TagsPlugin/untag',
type: "POST",
data: { tag : settings.tag,
item : settings.item,
Expand Down Expand Up @@ -103,14 +105,14 @@
jQuery.tagsplugin.public = function(tag,public,options) {
var settings = $.extend({
tag: tag,
user: foswiki.wikiName,
item: foswiki.web+"."+foswiki.topic,
user: foswiki.WIKINAME,
item: foswiki.WEB+"."+foswiki.TOPIC,
public: public,
completed: function(){}
},options||{});

$.ajax(
{ url: foswiki.scriptUrl+'/rest/TagsPlugin/public',
{ url: foswiki.SCRIPTURL+'/rest/TagsPlugin/public',
type: "POST",
data: { tag : settings.tag,
item : settings.item,
Expand All @@ -135,7 +137,7 @@
},options||{});

$.ajax(
{ url: foswiki.scriptUrl+'/rest/TagsPlugin/rename',
{ url: foswiki.SCRIPTURL+'/rest/TagsPlugin/rename',
type: "POST",
data: { oldtag : settings.oldtag,
newtag : settings.newtag,
Expand All @@ -159,7 +161,7 @@
},options||{});

$.ajax(
{ url: foswiki.scriptUrl+'/rest/TagsPlugin/merge',
{ url: foswiki.SCRIPTURL+'/rest/TagsPlugin/merge',
type: "POST",
data: { tag1 : settings.tag1,
tag2 : settings.tag2,
Expand All @@ -177,17 +179,17 @@
jQuery.tagsplugin.changeOwner = function(tag,public,options) {
var settings = $.extend({
tag: tag,
user: foswiki.wikiName,
newuser: foswiki.wikiName,
item: foswiki.web+"."+foswiki.topic,
user: foswiki.WIKINAME,
newuser: foswiki.WIKINAME,
item: foswiki.WEB+"."+foswiki.TOPIC,
public: public,
completed: function(){}
},options||{});

foswiki.tag = tag; // SMELL

$.ajax(
{ url: foswiki.scriptUrl+'/rest/TagsPlugin/changeOwner',
{ url: foswiki.SCRIPTURL+'/rest/TagsPlugin/changeOwner',
type: "POST",
data: { tag : settings.tag,
item : settings.item,
Expand Down Expand Up @@ -255,7 +257,7 @@
}

$("#tagsplugin_taglist_tags.tagsplugin_update_observer").live("tagsplugin_update", function() { refreshTagList() } );
$("#tagsplugin_dialog_details.tagsplugin_update_observer").live("tagsplugin_update", function() { refreshTagDetailsDialog( foswiki.tag, foswiki.web, foswiki.topic, "Simple" ) } );
$("#tagsplugin_dialog_details.tagsplugin_update_observer").live("tagsplugin_update", function() { refreshTagDetailsDialog( foswiki.tag, foswiki.WEB, foswiki.TOPIC, "Simple" ) } );

jQuery.tagsplugin.redirect_tagdetails();

Expand All @@ -264,8 +266,8 @@
function refreshTagList() {
$("#tagsplugin_processing img").show();
$.get(
foswiki.scriptUrl+"/view/"+foswiki.systemWebName+'/TagsPluginTagList',
{ skin: 'text', cover: 'text', tagweb: foswiki.web, tagtopic: foswiki.topic },
foswiki.SCRIPTURL+"/view/"+foswiki.SYSTEMWEB+'/TagsPluginTagList',
{ skin: 'text', cover: 'text', tagweb: foswiki.WEB, tagtopic: foswiki.TOPIC },
function(data) {
$("#tagsplugin_taglist_tags").html(data);
jQuery.tagsplugin.redirect_tagdetails();
Expand All @@ -280,15 +282,15 @@
};
$('#tagsplugin_dialog_details')
.load(
foswiki.scriptUrl+"/view/"+foswiki.systemWebName+"/TagsPluginTagDetailsDialog?skin=text&cover=text&tag="+escape(tag)+"&tagweb="+escape(web)+"&tagtopic="+escape(topic)+"&dialog="+escape(dialog_type),
foswiki.SCRIPTURL+"/view/"+foswiki.SYSTEMWEB+"/TagsPluginTagDetailsDialog?skin=text&cover=text&tag="+escape(tag)+"&tagweb="+escape(web)+"&tagtopic="+escape(topic)+"&dialog="+escape(dialog_type),
null,
function() {
$("#tagsplugin_dialog_details").dialog("open");
$("#tagsplugin_processing img").hide();
/*
TODO: hide those you cannot change
$(".tagsplugin_dialog_editUserButton").each( function() {
var regexp = RegExp("\b"+foswiki.wikiName+"\b");
var regexp = RegExp("\b"+foswiki.WIKINAME+"\b");
var groups = $('#tagsplugin_groups').text() + "," + $(this).attr("user");
if ( !regexp.test(groups) ) { $(this).hide(); };
} );
Expand All @@ -304,12 +306,12 @@

// construct <select>
var group_select = "<select>";
if ( foswiki.wikiName != user ) { groups.push( foswiki.wikiName ) };
if ( foswiki.WIKINAME != user ) { groups.push( foswiki.WIKINAME ) };
for (var i=0; i < groups.length; i++) {
var current_user = (user == groups[i]) ? "selected" : "";
group_select += "<option "+current_user+">"+groups[i]+"</option>";
};
group_select += "</select>&nbsp;<img src='"+foswiki.pubUrl+"/"+foswiki.systemWebName+"/DocumentGraphics/choice-yes.gif' />";
group_select += "</select>&nbsp;<img src='"+foswiki.PUBURL+"/"+foswiki.SYSTEMWEB+"/DocumentGraphics/choice-yes.gif' />";

// replace owner with select-box
$(event.target).closest('span')
Expand All @@ -324,7 +326,7 @@
var user = event.data.user;
var public = event.data.public;
var newuser = selection.val();
var item = foswiki.web+"."+foswiki.topic;
var item = foswiki.WEB+"."+foswiki.TOPIC;
if ( user != newuser ) {
$("#tagsplugin_tagdetails_processing").show();
jQuery.tagsplugin.changeOwner(tag, public, { user:user,
Expand Down
2 changes: 1 addition & 1 deletion pub/System/TagsPlugin/tagsplugin-tagcloud.js
View file
Expand Up @@ -44,7 +44,7 @@
function refreshTagCloud() {
$("#tagsplugin_processing img").show();
$.get(
foswiki.scriptUrl+"/view/"+foswiki.systemWebName+"/TagsPluginTagCloud",
foswiki.SCRIPTURL+"/view/"+foswiki.SYSTEMWEB+"/TagsPluginTagCloud",
{ skin : "text",
cover : "text",
tagweb : $(".tagsplugin_web_active").attr("web"),
Expand Down
2 changes: 1 addition & 1 deletion pub/System/TagsPlugin/tagsplugin-tagentry.js
View file
Expand Up @@ -19,7 +19,7 @@
var tagsplugin_taginput_input = $("#tagsplugin_taginput_input");
var tagsplugin_autocomplete_webdefault = tagsplugin_taginput_input.attr("autocomplete_web");
tagsplugin_taginput_input.autocomplete(
foswiki.scriptUrl+"/view/"+foswiki.systemWebName+"/TagsPluginAutoCompleteBackend", {
foswiki.SCRIPTURL+"/view/"+foswiki.SYSTEMWEB+"/TagsPluginAutoCompleteBackend", {
extraParams: { skin:"text", cover:"text", web: tagsplugin_autocomplete_webdefault },
multiple: false,
highlight: false,
Expand Down
7 changes: 7 additions & 0 deletions templates/view.tagspluginjquery.tmpl
View file
Expand Up @@ -3,9 +3,16 @@

%TMPL:DEF{"tagsplugin:jquery:header"}%
<literal>
<!--
TMPL:P{"LIBJS" id="TAGSPLUGIN:base" path="TagsPlugin/tagsplugin-base" requires="FOSWIKILIB,FOSWIKILIB:Pref"}%
TMPL:P{"LIBJS" id="TAGSPLUGIN:tagentry" path="TagsPlugin/tagsplugin-tagentry" requires="TAGSPLUGIN:base"}%
TMPL:P{"LIBJS" id="TAGSPLUGIN:tagcloud" path="TagsPlugin/tagsplugin-tagcloud" requires="TAGSPLUGIN:base"}%
-->

<script type="text/javascript" src="%PUBURL%/System/TagsPlugin/tagsplugin-base.js"></script>
<script type="text/javascript" src="%PUBURL%/System/TagsPlugin/tagsplugin-tagentry.js"></script>
<script type="text/javascript" src="%PUBURL%/System/TagsPlugin/tagsplugin-tagcloud.js"></script>

<div id="tagsplugin" class="%IF{"$ TAGSPLUGIN_TOPBAR_DISABLE='1'" then="tagsplugin_hide"}%">
<div id='tagsplugin_view_basic'>
<div id='tagsplugin_view_basic_content'>
Expand Down

0 comments on commit 2a96c6a

Please sign in to comment.