# HG changeset patch # User Zoe Hong # Date 1428411579 -7200 # Node ID 6676ca451dcc141f7829c8541c5f0b114bbb4621 # Parent 3ada9334ebfc7d68c4ea60cc618a035dab515307 New: check taglist is deprecated or not. Change url 'LGserver'->'LGServices' diff -r 3ada9334ebfc -r 6676ca451dcc config/config.php --- a/config/config.php Tue Apr 07 14:45:31 2015 +0200 +++ b/config/config.php Tue Apr 07 14:59:39 2015 +0200 @@ -9,7 +9,7 @@ $mysql_user = "root"; $mysql_password = "admin"; $server_host = "http://localgazetteers-dev/"; - $lgserver_url = $server_host."LGServer/"; + $lgserver_url = $server_host."LGServices/"; } else { // localhost @@ -18,7 +18,7 @@ $mysql_user = "root"; $mysql_password = "root"; $server_host = "http://localhost:1080/localgazetteers-dev/"; - $lgserver_url = "http://localgazetteers-dev/LGServer/"; + $lgserver_url = "http://localgazetteers-dev/LGServices/"; } $systemNAME = "interface"; diff -r 3ada9334ebfc -r 6676ca451dcc views/Extractapp/TaggingText.php --- a/views/Extractapp/TaggingText.php Tue Apr 07 14:45:31 2015 +0200 +++ b/views/Extractapp/TaggingText.php Tue Apr 07 14:59:39 2015 +0200 @@ -209,30 +209,6 @@ } - // --- handle old version taglist --- - // --- TODO: check if taglist in file is up-to-date --- - /* - var taglist_infile = JSON.parse(''); - if (taglist_infile != "") { - // TODO: pop up to ask if load the latest taglist - var retVal = confirm("Tag list in file is not up-to-date. \nDo you want to load file with new tag list?"); - if( retVal == true ){ - // use $taglisArray - alert("Load file with new tag list."); - }else{ - // use $taglist_infile as $taglistArray - - alert("You are viewing the file with old version of tag list. Please use the up-to-date taglist."); - } - //_showTagColor(retVal); - - } - */ - - - }); $(document).on("mouseup", '#editable-area', function (e) {