Fixed wikicipher button in toolbar when not in Wiki context

Fixed formatting
keeps · Apr 13, 2015 · 542f51b · 542f51b
1 parent 3b377e4
commit 542f51b
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 15 deletions.
diff --git a/assets/javascripts/jstoolbar/wikicipher.js b/assets/javascripts/jstoolbar/wikicipher.js
@@ -11,20 +11,18 @@ jsToolBar.prototype.elements.wikicipher = {
 }
 
 window.onload=function(){
-	try{
-		var warn = document.getElementsByClassName('flash warning');
-		var isWiki = "/Wiki/edit";
-		if (warn.length>0){
-			document.getElementsByClassName('jstb_wikicipher')[0].hide();
-		}
-		if(window.location.pathname.indexOf(isWiki, window.location.pathname.length - isWiki.length) !== -1){
-			// nothing to do...
-		}else{
-			//hide wikicipher toolbar button
-			document.getElementsByClassName('jstb_wikicipher')[0].style.visibility='hidden';
+	var warn = document.getElementsByClassName('flash warning');
+	var isWiki = "/Wiki/edit";
+	if (warn.length>0){
+		document.getElementsByClassName('jstb_wikicipher')[0].hide();
+	}
+	if(window.location.pathname.indexOf(isWiki, window.location.pathname.length - isWiki.length) !== -1){
+		// nothing to do...
+	}else{
+		//hide wikicipher toolbar buttons
+		var elems = document.getElementsByClassName('jstb_wikicipher');
+		for(var i = 0; i != elems.length; ++i){
+			elems[i].style.visibility = "hidden";
 		}
-	}catch(e){
-		alert(e);
 	}
-
 };
diff --git a/lib/wiki_controller_patch.rb b/lib/wiki_controller_patch.rb
@@ -111,7 +111,7 @@ def decodeContent(originalText,params,tags,export)
 
 						decoded = ''+decoded+''
 					else
-            decoded = "<notextile>"+decoded+"</notextile>"
+						decoded = "<notextile>"+decoded+"</notextile>"
 						decoded = '{{decoded_start}} '+decoded+' {{decoded_stop}}'
 					end
 					originalText = originalText.gsub(m.strip.force_encoding("UTF-8"), decoded.strip.force_encoding("UTF-8"))