Fix for bug when retrieving homonym taxa names

[jpjenk]

issue #47

[jczaplew]

Also, be sure to run gulp so that the compiled javascript files are created for production deployment.

[jpjenk]

@jczaplew, I have added the braces in both locations. isPhylo simply is not used anywhere in the entire Navigator source code. I would have left it there anyway but I was working with Michael and he just said chuck it.

I ran grunt to build everything before I pushed the branch to GitHub, do I also have to run gulp? If so, I don't have see a task runner script for that.

Having made these corrections, should I now push the branch again?

[jczaplew]

@jpjenk My bad - it is definitely grunt and not gulp.

Yep! Go ahead and push to this branch.

[jpjenk]

@jczaplew I've pushed the new commit on branch homonym_search_fix which just includes the braces. I ran grunt again before pushing.

After you do the merge, who is responsible for pulling the new master to phylum? Also does this need to be merged into the dev branch as well since that is what is running on teststrata? Thanks

[jczaplew]

@jpjenk - Looks good. Still not seeing changes to build/script.min.js which means grunt hasn't been run.

Yep, step 1 is to merge this pull into master. After that it can be merged into dev. I can pull it on to phylum.

[jpjenk]

@jczaplew Hmm.. Just ran it again and tried to commit and push, showing this on my local machine:

======= ➜ navigator git:(homonym_search_fix) ✗ grunt Running "htmlhint:build" (htmlhint) task

1 file lint free.

Running "uglify:build" (uglify) task File "build/js/script.min.js" created.

Running "cssmin:combine" (cssmin) task File build/css/navigator.min.css created.

Done, without errors. ➜ navigator git:(homonym_search_fix) ✗ git commit -a On branch homonym_search_fix Untracked files: package-lock.json

nothing added to commit but untracked files present ➜ navigator git:(homonym_search_fix) ✗ git push origin homonym_search_fix Everything up-to-date ➜ navigator git:(homonym_search_fix) ✗

[jczaplew]

@jpjenk if you do git diff after running grunt what do you see?

[jpjenk]

@jczaplew, I just checked ./assets/js/navMap.js and taxaBrowser.js and the new {braces} are there. Ran grunt once again and did a git diff ... blank page, it is fully up-to-date with GitHub. I also ran:

git ls-tree -r homonym_search_fix --name-only

to make sure build/js/script.min.js is included in this branch. It is. Do you think the compiler/minimizer script is just taking the braces back out again anyway since it is a one line if/else? Because, you know, those 32 bits of data are really going to choke the internet :)

[jczaplew]

@jpjenk - odd. I just pulled it down and was able to minify the css and js. Not sure, but we should be good now! Have you checked this branch out on dev and tested it?

[jpjenk]

@jczaplew I just checked out homonym_search_fix on teststrata but the changes are not there. Now I'm quite confused because git log shows most recent commit is:

commit b7f565793745972bf1a702cf917009cdeb56ddd8 Author: John J Czaplewski john@czaplewski.org Date: Fri Oct 20 10:29:51 2017 -0500

Minified css and js

[jczaplew]

@jpjenk - could you clarify by what you mean? Are the changes not showing up in the interface?