Fixed wikicipher button issue

Incremented version
keeps · Apr 13, 2015 · 6597cbb · 6597cbb
1 parent 542f51b
commit 6597cbb
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/assets/javascripts/jstoolbar/wikicipher.js b/assets/javascripts/jstoolbar/wikicipher.js
@@ -12,11 +12,17 @@ jsToolBar.prototype.elements.wikicipher = {
 
 window.onload=function(){
 	var warn = document.getElementsByClassName('flash warning');
-	var isWiki = "/Wiki/edit";
+	var wikiEdit = "/edit";
+	var wiki = "wiki";
 	if (warn.length>0){
 		document.getElementsByClassName('jstb_wikicipher')[0].hide();
 	}
-	if(window.location.pathname.indexOf(isWiki, window.location.pathname.length - isWiki.length) !== -1){
+	var pathName = window.location.pathname;
+	if(
+		(pathName.indexOf(wiki)>=0 && pathName.indexOf(wikiEdit, pathName.length - wikiEdit.length) !== -1)
+		||
+		(pathName.indexOf(wiki, pathName.length - wiki.length) !== -1)
+	){
 		// nothing to do...
 	}else{
 		//hide wikicipher toolbar buttons

diff --git a/init.rb b/init.rb
@@ -14,7 +14,7 @@
   author 'Sébastien Leroux'
   author_url 'mailto:[email protected]'
   description 'This plugin adds the ability to encrypt section of text'
-  version '0.0.8'
+  version '0.0.10'
   url 'https://github.com/keeps/redmine_wikicipher'
 end