Merge branch '0.98'
This commit is contained in:
Christian Weiske
commit
41fed87698
3 changed files with 1 additions and 107 deletions
|
|
@ -1,35 +0,0 @@
|
||||||
<?php
|
|
||||||
/***************************************************************************
|
|
||||||
Copyright (C) 2005 - 2006 Scuttle project
|
|
||||||
http://sourceforge.net/projects/scuttle/
|
|
||||||
http://scuttle.org/
|
|
||||||
|
|
||||||
This program is free software; you can redistribute it and/or modify
|
|
||||||
it under the terms of the GNU General Public License as published by
|
|
||||||
the Free Software Foundation; either version 2 of the License, or
|
|
||||||
(at your option) any later version.
|
|
||||||
|
|
||||||
This program is distributed in the hope that it will be useful,
|
|
||||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
GNU General Public License for more details.
|
|
||||||
|
|
||||||
You should have received a copy of the GNU General Public License
|
|
||||||
along with this program; if not, write to the Free Software
|
|
||||||
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
||||||
***************************************************************************/
|
|
||||||
|
|
||||||
?>
|
|
||||||
|
|
||||||
<?php if (isset($loadjs)) :?>
|
|
||||||
<script type="text/javascript"
|
|
||||||
src="http://ajax.googleapis.com/ajax/libs/dojo/1.2/dojo/dojo.xd.js"
|
|
||||||
djConfig="parseOnLoad:true, isDebug:<?php echo DEBUG_MODE?'true':'false' ?>, usePlainJson:true, baseUrl: '<?php echo ROOT ?>', modulePaths: {'js': 'js'}"></script>
|
|
||||||
|
|
||||||
<script type="text/javascript">
|
|
||||||
dojo.require("dojo.parser");
|
|
||||||
dojo.require("dojo.data.ItemFileReadStore");
|
|
||||||
dojo.require("js.MultiComboBox"); // DOJO module adapted for SemanticScuttle
|
|
||||||
dojo.require("dijit.Tree");
|
|
||||||
</script>
|
|
||||||
<?php endif ?>
|
|
||||||
|
|
@ -6,6 +6,7 @@ ChangeLog for SemantiScuttle
|
||||||
0.98.1 - 2011-XX-XX
|
0.98.1 - 2011-XX-XX
|
||||||
-------------------
|
-------------------
|
||||||
- Fix bug #3375635: XML parsing problem in top.inc.php
|
- Fix bug #3375635: XML parsing problem in top.inc.php
|
||||||
|
- Fix bug #3375428: Forgot to remove some old dojo files
|
||||||
|
|
||||||
|
|
||||||
0.98.0 - 2011-07-21
|
0.98.0 - 2011-07-21
|
||||||
|
|
|
||||||
|
|
@ -1,72 +0,0 @@
|
||||||
/*
|
|
||||||
Copyright (c) 2004-2008, The Dojo Foundation All Rights Reserved.
|
|
||||||
Available via Academic Free License >= 2.1 OR the modified BSD license.
|
|
||||||
see: http://dojotoolkit.org/license for details
|
|
||||||
*/
|
|
||||||
|
|
||||||
/* SemanticScuttle: This script is a light modification of dojox.form.MultiComboBox
|
|
||||||
This fork allows specific use until DOJO 1.2.3 in Google CDN. */
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
if(!dojo._hasResource["js.MultiComboBox"]){ //_hasResource checks added by build. Do not use _hasResource directly in your code.
|
|
||||||
dojo._hasResource["js.MultiComboBox"] = true;
|
|
||||||
dojo.provide("js.MultiComboBox");
|
|
||||||
dojo.experimental("js.MultiComboBox");
|
|
||||||
dojo.require("dijit.form.ComboBox");
|
|
||||||
dojo.require("dijit.form.ValidationTextBox");
|
|
||||||
|
|
||||||
dojo.declare("js.MultiComboBox",
|
|
||||||
[dijit.form.ValidationTextBox, dijit.form.ComboBoxMixin],{
|
|
||||||
//
|
|
||||||
// summary: A ComboBox that accpets multiple inputs on a single line?
|
|
||||||
//
|
|
||||||
// delimiter: String
|
|
||||||
// The character to use to separate items in the ComboBox input
|
|
||||||
delimiter: ",",
|
|
||||||
_previousMatches: false,
|
|
||||||
|
|
||||||
_setValueAttr: function(value){
|
|
||||||
if (this.delimiter && value.length != 0){
|
|
||||||
value = value+this.delimiter+" ";
|
|
||||||
arguments[0] = this._addPreviousMatches(value);
|
|
||||||
}
|
|
||||||
this.inherited(arguments);
|
|
||||||
},
|
|
||||||
|
|
||||||
_addPreviousMatches: function(/* String */text){
|
|
||||||
if(this._previousMatches){
|
|
||||||
if(!text.match(new RegExp("^"+this._previousMatches))){
|
|
||||||
text = this._previousMatches+text;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
text = this._cleanupDelimiters(text); // SScuttle: this line was moved
|
|
||||||
return text; // String
|
|
||||||
},
|
|
||||||
|
|
||||||
_cleanupDelimiters: function(/* String */text){
|
|
||||||
if(this.delimiter){
|
|
||||||
text = text.replace(new RegExp(" +"), " ");
|
|
||||||
text = text.replace(new RegExp("^ *"+this.delimiter+"* *"), "");
|
|
||||||
text = text.replace(new RegExp(this.delimiter+" *"+this.delimiter), this.delimiter);
|
|
||||||
}
|
|
||||||
return text;
|
|
||||||
},
|
|
||||||
|
|
||||||
_autoCompleteText: function(/* String */text){
|
|
||||||
arguments[0] = this._addPreviousMatches(text);
|
|
||||||
this.inherited(arguments);
|
|
||||||
},
|
|
||||||
|
|
||||||
_startSearch: function(/* String */text){
|
|
||||||
text = this._cleanupDelimiters(text);
|
|
||||||
var re = new RegExp("^.*"+this.delimiter+" *");
|
|
||||||
|
|
||||||
if((this._previousMatches = text.match(re))){
|
|
||||||
arguments[0] = text.replace(re, "");
|
|
||||||
}
|
|
||||||
this.inherited(arguments);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
}
|
|
||||||
Loading…
Reference in a new issue