james/fembooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Tagger 20071001 1235 - Stupid mistake fix

Browse Source 
git-svn-id: file:///home/shish/svn/shimmie2/trunk@507 7f39781d-f577-437e-ae19-be835c7a54ca
This commit is contained in:
Artanis 2007-10-01 19:36:28 +00:00
parent 341182efb2
commit 49606dad70
3 changed files with 43 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/tagger/main.php
View File

@ -29,7 +29,7 @@ class tagger extends Extension {
global $config;
$base_href = $config->get_string('base_href');
$tags_min = $config->get_int('ext-tagger_tags-min',2);
$tags_min = (isset($_GET['tagger_min']) && $_GET['tagger_min']>0)?$_GET['tagger_min']:$config->get_int('ext-tagger_tags-min',2);
$hidden = $config->get_string(
'ext-tagger_show-hidden','N')=='N' ?
" AND substring(tag,1,1) != '.' " : null;

59
contrib/tagger/script.js
View File

@ -6,8 +6,21 @@
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *\
* Tagger Management *
\* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
// Global settings and oft-used objects
var remove_tagme = null;
var tags_field = false;
var set_button = false;
// TODO: Store tagger's list here? Wouldn't need to get the elements every time,
// but memory overhead?
// Put everything in a class? better?
function taggerInit() {
// get imgdata hooks
tags_field = (byId('tags') || getTagsField());
set_button = getSetButton();
// Set up Tagger
taggerResetPos();
tagger_tagIndicators()
DragHandler.attach(byId("tagger_titlebar"));
@ -60,12 +73,10 @@ function toggleTag(objTag) {
if(t.value) { t.select(); }
}
function addTag (objTag) {
var tags = byId('tags');
delim = tags.value==" "?"":" ";
function addTag (objTag) {
delim = tags_field.value==" "?"":" ";
tags.value += delim + objTag.getAttribute('tag');
tags_field.value += delim + objTag.getAttribute('tag');
if(objTag.value != 'Add') {
objTag.style.fontWeight = "bold";
@ -73,18 +84,16 @@ function addTag (objTag) {
}
function remTag (objTag) {
var tags = byId("tags");
aTags = tags_field.value.split(" ");
aTags = tags.value.split(" ");
tags.value="";
tags_field.value="";
for(i in aTags) {
aTag = aTags[i];
if(aTag != objTag.getAttribute('tag')) {
if(tags.value=="") {
tags.value += aTag;
if(tags_field.value=="") {
tags_field.value += aTag;
} else {
tags.value += " "+aTag;
tags_field.value += " "+aTag;
}
}
}
@ -94,16 +103,15 @@ function remTag (objTag) {
}
function tagExists(objTag) {
return byId("tags").value.match(reescape(objTag.getAttribute('tag')));
return tags_field.value.match(reescape(objTag.getAttribute('tag')));
}
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *\
* Filtering *
\* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
var tagger_filter_focus = false;
function tagger_filter(override) {
if(tagger_filter_focus || override) {
function tagger_filter() {
if(tagger_filter_focus) {
var filter = byId('tagger_new-tag');
var arObjTags = getElementsByTagNames('a',byId('tagger_body'));
var prepend = filter.value.length<2? " ":"_";
@ -146,15 +154,24 @@ function taggerFilterMode(objTag) {
* Misc *
\* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
function getTagsField() {
var nodes = getElementsByTagNames('input,textarea',byId('imgdata'));
for (i in nodes) {
node = nodes[i];
if (node.getAttribute('name') == 'tags')
return node;
}
return false;
}
function pushSet(form_id) {
var set = getSetButton(form_id);
if(set) {
set.click();
if(set_button) {
set_button.click();
}
}
function getSetButton(form_id) {
var form_nodes = getElementsByTagNames('input',byId(form_id));
function getSetButton() {
var form_nodes = getElementsByTagNames('input',byId('imgdata'));
for (i in form_nodes) {
node = form_nodes[i];
if (node.getAttribute('value')=="Set" && node.getAttribute('type')=="submit") {

9
contrib/tagger/theme.php
View File

@ -43,10 +43,9 @@ class taggerTheme extends Themelet {
"<div id='tagger_window'>
<div id='tagger_titlebar' title='Drag to move'>Tagger</div>
<div id='tagger_filter'>
<input type='text' id='tagger_new-tag' value='' size='12'
onfocus='tagger_filter_focus = true;'
onblur='tagger_filter_focus = false;'
onkeyup='tagger_filter();' focus='' title='Type to search' >
<input type='text' id='tagger_new-tag' value='' size='12'
onfocus='this.select();' onkeyup='tagger_filter();'
focus='' title='Type to search' >
</input>
<input type='button' value='Add' tag='' title='Add typed tag'
onclick='
@ -54,7 +53,7 @@ class taggerTheme extends Themelet {
byId(\"tagger_new-tag\").value;
toggleTag(this);'>
</input>
<input type='button' value='Set' onclick='pressSet();'
<input type='button' value='Set' onclick='pushSet();'
title='Save tags'></input>
$tagme
<hr/>