From baa6fa95572156f59c9faa9a2a15ff83bfea6ac5 Mon Sep 17 00:00:00 2001
From: Frans de Jonge <fransdejonge@gmail.com>
Date: Thu, 7 Apr 2016 14:54:34 +0200
Subject: [PATCH] General fixes

Fixed Elk language string
Fixed smiley detection, align detection, lists
Added [tt], [pre]
BBC to lowercase
General code quality and style
---
 package-info.xml       |   2 +-
 quickQuote.english.php |   2 +-
 quickQuote.hooks.php   |   3 +-
 quickQuote.js          | 536 +++++++++++++++++++++--------------------
 4 files changed, 279 insertions(+), 264 deletions(-)

diff --git a/package-info.xml b/package-info.xml
index 8ce896a..f070ad7 100644
--- a/package-info.xml
+++ b/package-info.xml
@@ -3,7 +3,7 @@
 <package-info xmlns="http://www.elkarte.net/site/package-info" xmlns:elk="http://www.elkarte.net/">
 	<id>Frenzie:quick_quote</id>
 	<name>Quick Quote</name>
-	<version>0.1</version>
+	<version>0.2</version>
 	<type>addon</type>
 	<install for="1.0 - 1.0.99">
 		<readme parsebbc="true">readme.txt</readme>
diff --git a/quickQuote.english.php b/quickQuote.english.php
index 1a151e1..aef803e 100644
--- a/quickQuote.english.php
+++ b/quickQuote.english.php
@@ -1,3 +1,3 @@
 <?php
 
-$txt['quick_quote'] = 'Quick quote';
+$txt['quick_quote'] = 'Quick Quote';
diff --git a/quickQuote.hooks.php b/quickQuote.hooks.php
index 4d411a5..30834c2 100644
--- a/quickQuote.hooks.php
+++ b/quickQuote.hooks.php
@@ -13,7 +13,8 @@ function QQ_integrate_load_theme()
 {
 	global $txt, $modSettings;
 
-	addInlineJavascript('		
+	loadLanguage('quickQuote');
+	addInlineJavascript('
 		quickQuote.txt = ' . $txt['quick_quote'] . ';', true);
 
 	loadJavascriptFile('quickQuote.js');
diff --git a/quickQuote.js b/quickQuote.js
index 8bb5092..aba33fe 100644
--- a/quickQuote.js
+++ b/quickQuote.js
@@ -2,45 +2,52 @@
 // Used in quick quote.
 // Thanks to fearphage https://gist.github.com/fearphage/222294
 if ((typeof Node != 'undefined') && !document.selectNodes) {
-  Node.prototype.selectNodes = function(xpath, resolver) {
-    var contextNode = this.ownerDocument || this, result = [], i = 0, node
-        ,nodes = contextNode.evaluate(xpath, contextNode, resolver || null, XPathResult.ORDERED_NODE_SNAPSHOT_TYPE, null);
-    while (node = nodes.snapshotItem(i++)) {
-      result.push(node);
-    }
-    return result;
-  };
-  Node.prototype.selectSingleNode = function(xpath, resolver) {
-    return document.evaluate(xpath, this.ownerDocument || this, resolver || null, XPathResult.FIRST_ORDERED_NODE_TYPE, null).singleNodeValue;
-  };
+	Node.prototype.selectNodes = function(xpath, resolver) {
+		var contextNode = this.ownerDocument || this, result = [], i = 0, node,
+			nodes = contextNode.evaluate(xpath, contextNode, resolver || null, XPathResult.ORDERED_NODE_SNAPSHOT_TYPE, null);
+		while (node = nodes.snapshotItem(i++)) {
+			result.push(node);
+		}
+		return result;
+	};
+	Node.prototype.selectSingleNode = function(xpath, resolver) {
+		return document.evaluate(xpath, this.ownerDocument || this, resolver || null, XPathResult.FIRST_ORDERED_NODE_TYPE, null).singleNodeValue;
+	};
 }
 
 // This particular function was based on My Opera Enhancements and is
 // licensed under the BSD license.
 function initializeQuickQuote() {
 	'use strict';
-	
-	
+
 	/*
-  * setHiddenFlag() - transverses tree under node and set a flag telling whether element is hidden or not
-  */
-  function setHiddenFlag(node){
-    if( !node ) return;
-    if( typeof node.item == 'function' ){
-      for(var k=0,n;n=node[k++];)
-        setHiddenFlag(n);
-    }
-    else if( isHidden(node)!='' ){
-      node.setAttribute('userjsishidden','true');
-    }
-    else{
-      if(node.removeAttribute)node.removeAttribute('userjsishidden');
-      if(node.childNodes)setHiddenFlag(node.childNodes);
-    }
-  };
-  /*
-  * isHidden() - tells if element should be considered as not visible
-  */
+	 * setHiddenFlag() - transverses tree under node and set a flag telling whether element is hidden or not
+	 */
+	function setHiddenFlag(node) {
+		if (!node) {
+			return;
+		}
+		if (typeof node.item == 'function') {
+			var k, n;
+			for (k=0; n=node[k++];) {
+				setHiddenFlag(n);
+			}
+		}
+		else if (isHidden(node) !== '') {
+			node.setAttribute('userjsishidden', 'true');
+		}
+		else {
+			if (node.removeAttribute) {
+				node.removeAttribute('userjsishidden');
+			}
+			if (node.childNodes) {
+				setHiddenFlag(node.childNodes);
+			}
+		}
+	}
+	/*
+	 * isHidden() - tells if element should be considered as not visible
+	 */
   function isHidden(node){
     if(node && node.nodeType == Node.ELEMENT_NODE){
       var compStyles = getComputedStyle(node,'');
@@ -54,105 +61,135 @@ function initializeQuickQuote() {
     }
     return '';
   }
-  /*
-  * treeToBBCode() - parses the tree into bbcode
-  */
-  function treeToBBCode(node){
-    var bb = [];
-    if( typeof node.item == 'function' ){
-      for(var k=0,n;n=node[k++];)
-        bb.push(treeToBBCode(n));
-      return bb.join('');
-    }
+	/*
+	 * checkCSSProps() - compares CSS properties against a predefined array
+	 */
+	function checkCSSProps(node, props) {
+		var start='', end='', k=0, p;
 
-    if( node.getAttribute && node.getAttribute('userjsishidden')=='true' ){
-      return;
-    }
+		for (k=0; p=props[k++];) {
+			var value = trim(node.style[p.name] || '',' "');
+			if ( ( p.forceValue && value==p.forceValue ) || ( !p.forceValue && value ) ) {
+				start += p.before.replace('@value',(p.values ? p.values[value]:null) || value);
+				end += p.after;
+			}
+		}
 
-    switch(node.nodeType){
-    case Node.ELEMENT_NODE:
-      var nname = node.nodeName.toLowerCase();
-      var def = treeToBBCode.defaults[nname];
-      if( def ){
-        //generic behavior
-        bb.push(def.before||'');
-        bb.push(treeToBBCode(node.childNodes));
-        bb.push(def.after||'');
-      }
-      else{
-        //special cases
-        switch(nname){
-        case 'a':
-          if( node.href.indexOf("mailto:")==0 ){
-            bb.push('[EMAIL='+node.href.substring(7)+']');
-            bb.push(treeToBBCode(node.childNodes));
-            bb.push('[/EMAIL]');
-          }
-          else if( node.className.indexOf("attach")>=0 ){
+		return {start: start, end: end};
+	}
+	/*
+	 * treeToBBCode() - parses the tree into bbcode
+	 */
+	function treeToBBCode(node){
+		var k, n,
+			checked, start, end,
+			bb = [], props = [];
+
+		if (typeof node.item == 'function') {
+			for (k=0; n=node[k++];) {
+				bb.push(treeToBBCode(n));
+			}
+			return bb.join('');
+		}
+
+		if (node.getAttribute && node.getAttribute('userjsishidden') == 'true') {
+			return;
+		}
+
+		switch(node.nodeType){
+		case Node.ELEMENT_NODE:
+			var nname = node.nodeName.toLowerCase();
+			var def = treeToBBCode.defaults[nname];
+			if (def) {
+				//generic behavior
+				bb.push(def.before||'');
+				bb.push(treeToBBCode(node.childNodes));
+				bb.push(def.after||'');
+			}
+			else {
+				//special cases
+				switch(nname){
+				case 'a':
+					if (node.href.indexOf('mailto:') === 0) {
+						bb.push('[email='+node.href.substring(7)+']');
+						bb.push(treeToBBCode(node.childNodes));
+						bb.push('[/email]');
+					}
+					else if (node.className.indexOf("attach") >= 0) {
             bb.push('[ATTACH='+node.href+']');
             bb.push(treeToBBCode(node.childNodes));
             bb.push('[/ATTACH]');
           }
-          else{
-            bb.push('[url='+node.href+']');
-            bb.push(treeToBBCode(node.childNodes));
-            bb.push('[/url]');
-          }
-          break;
-        case 'img':
-          var smileyCode = getSmileyCode(node);
-          bb.push( smileyCode ? ' '+smileyCode+' ' : '[img]'+node.src+'[/img]');
-          break;
-        case 'ol':
-          var type = node.className.indexOf("alpha")>=0 ? 'a' : '1';
+					else {
+						bb.push('[url='+node.href+']');
+						bb.push(treeToBBCode(node.childNodes));
+						bb.push('[/url]');
+					}
+					break;
+				case 'div':
+					props = [
+						{name:'textAlign', forceValue:'left', before:'[align=left]', after:'[/align]'},
+						{name:'textAlign', forceValue:'right', before:'[align=right]', after:'[/align]'},
+					];
+					checked = checkCSSProps(node, props);
+
+					bb.push(checked.start);
+					bb.push(treeToBBCode(node.childNodes));
+					bb.push(checked.end);
+					break;
+				case 'img':
+					var smileyCode = getSmileyCode(node);
+					bb.push(smileyCode ? ' '+smileyCode+' ' : '[img]'+node.src+'[/img]');
+					break;
         case 'ul':
-          bb.push('[list'+(type?'='+type:'')+']');
-          var lis = node.selectNodes('li');
-          for(var k=0,li;li=lis[k++];)
-            bb.push('\n  [*] '+trim(treeToBBCode(li)));
-          bb.push('[/list]');
-          break;
-        case 'span':
-          //check for css properties
-          var props=[
-            {name:'textDecoration',forceValue:'underline',before:'[u]',after:'[/u]'},
-            {name:'color',before:'[color=@value]',after:'[/color]'},
-            {name:'fontFamily',before:'[font=@value]',after:'[/font]'},
-            {name:'fontSize',before:'[size=@value]',after:'[/size]',values:{
-              'xx-small':1,
-              'x-small':2,
-              'small':3,
-              'medium':4,
-              'large':5,
-              'x-large':6,
-              'xx-large':7
-            }}
-          ];
-          var start='', end='';
-          for(var k=0,p;p=props[k++];){
-            var value = trim(node.style[p.name]||'',' "');
-            if( ( p.forceValue && value==p.forceValue ) || ( !p.forceValue && value ) ){
-              start += p.before.replace('@value',(p.values ? p.values[value]:null) || value);
-              end += p.after;
-            };
-          };
-          //check for class attribute
-          props=[
-            {name:'alignleft',before:'[ALIGN=left]',after:'[/ALIGN]'},
-            {name:'aligncenter',before:'[ALIGN=center]',after:'[/ALIGN]'},
-            {name:'alignright',before:'[ALIGN=right]',after:'[/ALIGN]'},
-            {name:'alignjustify',before:'[ALIGN=justify]',after:'[/ALIGN]'}
-          ];
-          for(var k=0,p;p=props[k++];){
-            if( node.className.indexOf(p.name)>=0 ){
-              start += p.before;
-              end += p.after;
-            };
-          };
-          bb.push(start);
-          bb.push(treeToBBCode(node.childNodes));
-          bb.push(end);
-          break;
+					props = [
+						{name:'listStyleType', forceValue:'decimal', before:'[list type=decimal]', after:'[/list]'},
+					];
+					checked = checkCSSProps(node, props);
+
+					bb.push((checked.start !== '') ? checked.start :  '[list]');
+					var li, lis = node.querySelectorAll('li');
+					for (k=0; li=lis[k++];) {
+						bb.push('\n  [*] '+trim(treeToBBCode(li)));
+					}
+					bb.push('[/list]');
+					break;
+				case 'span':
+					//check for css properties
+					props=[
+						{name:'textDecoration', forceValue:'underline', before:'[u]',after:'[/u]'},
+						{name:'color', before:'[color=@value]', after:'[/color]'},
+						{name:'fontFamily', before:'[font=@value]', after:'[/font]'},
+						{name:'fontSize', before:'[size=@value]', after:'[/size]', values:{
+							'xx-small':1,
+							'x-small':2,
+							'small':3,
+							'medium':4,
+							'large':5,
+							'x-large':6,
+							'xx-large':7
+						}}
+					];
+					checked = checkCSSProps(node, props);
+					start = checked.start;
+					end = checked.end;
+
+					//check for class attribute
+					props = [
+						{name:'centertext',before:'[align=center]',after:'[/align]'},
+						{name:'bbc_tt',before:'[tt]',after:'[/tt]'},
+					];
+					var p;
+					for (k=0; p=props[k++];) {
+						if (node.className.indexOf(p.name) >= 0) {
+							start += p.before;
+							end += p.after;
+						}
+					}
+					bb.push(start);
+					bb.push(treeToBBCode(node.childNodes));
+					bb.push(end);
+					break;
         case 'p':
           var ns = node.nextElementSibling||node.nextSibling;
           //detect quote
@@ -180,7 +217,7 @@ function initializeQuickQuote() {
         default:
           bb.push(treeToBBCode(node.childNodes));
           break;
-        };
+        }
       }
       break;
     case Node.DOCUMENT_NODE:// 9
@@ -188,55 +225,55 @@ function initializeQuickQuote() {
       bb.push(treeToBBCode(node.childNodes));
       break;
     case Node.TEXT_NODE://3
-    case Node.CDATA_SECTION_NODE:// 4
-      var text = node.nodeValue;
-      if (!node.selectSingleNode('ancestor::pre'))
-        text = text.replace(/\n[ \t]+/g,'\n')
-      bb.push(text);
-      break;
-    }
-    return bb.join('');
-  };
-  treeToBBCode.defaults = {
-    strong:{before:'[B]',after:'[/B]'},
-    b:{before:'[B]',after:'[/B]'},
-    i:{before:'[I]',after:'[/I]'},
-    em:{before:'[I]',after:'[/I]'},
-    s:{before:'[S]',after:'[/S]'},
-    sup:{before:'[SUP]',after:'[/SUP]'},
-    sub:{before:'[SUB]',after:'[/SUB]'},
-    pre:{before:'[CODE]',after:'[/CODE]'},
-    br:{before:'\n',after:''}
-  };
-	
-	  /*
-   * trim() - trim string
-   */
-  function trim(str, charToReplace) {
-    //if char is specified, use that one else clear whitespace
-    if( charToReplace ) {
-      return String(str).replace(new RegExp('^['+charToReplace+']+|['+charToReplace+']+$','g'),'');
-    }
-    else{
-      return String(str).replace(/^\s+|\s+$/g, '');
-    }
-  }
-	
-	  /*
-   * getSmileyCode() - returns smiley code
-   */
-  function getSmileyCode(img) {
+		case Node.CDATA_SECTION_NODE:// 4
+			var text = node.nodeValue;
+			if (!node.selectSingleNode('ancestor::pre'))
+				text = text.replace(/\n[ \t]+/g,'\n');
+			bb.push(text);
+			break;
+		}
+		return bb.join('');
+	}
+	treeToBBCode.defaults = {
+		strong:{before:'[b]',after:'[/b]'},
+		b:{before:'[b]',after:'[/b]'},
+		i:{before:'[i]',after:'[/i]'},
+		em:{before:'[i]',after:'[/i]'},
+		s:{before:'[s]',after:'[/s]'},
+		sup:{before:'[sup]',after:'[/sup]'},
+		sub:{before:'[sub]',after:'[/sub]'},
+		pre:{before:'[code]',after:'[/code]'},
+		br:{before:'\n',after:''}
+	};
+
+	/*
+	 * trim() - trim string
+	 */
+	function trim(str, charToReplace) {
+		//if char is specified, use that one else clear whitespace
+		if ( charToReplace ) {
+			return String(str).replace(new RegExp('^['+charToReplace+']+|['+charToReplace+']+$','g'),'');
+		}
+		else {
+			return String(str).replace(/^\s+|\s+$/g, '');
+		}
+	}
+
+	/*
+	 * getSmileyCode() - returns smiley code
+	 */
+	function getSmileyCode(img) {
 		var re = '^' + location.protocol + '\/\/' + location.hostname + '.+' + '\/smileys\/\\w+\/(\\w+)\\.gif$';
-		re = re.replace(/\//g, '\\/')
+		re = re.replace(/\//g, '\\/');
 		re = new RegExp(re);
-    if (!img.src.match(re))
-      return ''; // Event not spawned by a forum smiley (else match smiley name below)
-     
+		if (!img.src.match(re)) {
+			return ''; // Event not spawned by a forum smiley (else match smiley name below)
+		}
 		else {
 			// Alternative text corresponds to smiley code.
 			return img.alt;
 		}
-      
+
 /*
     var smileyName = RegExp.$1;
 
@@ -244,31 +281,65 @@ function initializeQuickQuote() {
       return buildSmileyTooltip.buildSmileyTooltipMatches[smileyName];
     else // Use filename to obtain smiley code.
       return ':'+smileyName+':';*/
-  }
-	
-	function getParents(el) {
-    var parents = [];
+	}
 
-    var p = el.parentNode;
+	function executeQuickQuote(e) {
+		e.preventDefault();
 
-    while (p !== null) {
-        var o = p;
-        parents.push(o);
-        p = o.parentNode;
-    }
-    return parents; // returns an Array []
-	}
-	
-	function getPostAncestor(selectionAncestor) {
-		var parents = getParents(selectionAncestor);
-		for(var i=0; i<parents.length; i++) {
-			parent = parents[i];
-			if (parent.tagName === 'div' && parent.className.indexOf('post') !== -1) {
-				return parent;
+		var startTag = e.target.startTag;
+		var endTag = e.target.endTag;
+
+		// isCollapsed is true for an empty selection
+		var selection = (window.getSelection().isCollapsed ? null : window.getSelection().getRangeAt(0));
+
+		if (selection) {
+			var selectionAncestor = selection.commonAncestorContainer;
+			var selectionContents;
+			var postAncestor = selectionAncestor.selectSingleNode('ancestor-or-self::div[contains(@class,"post")]');
+			setHiddenFlag(selectionAncestor);
+
+			if (selectionAncestor.nodeType != 3 && selectionAncestor.nodeType != 4)
+			{
+				selectionContents = selectionAncestor.cloneNode(false);
+				selectionContents.appendChild(selection.cloneContents());
+			}
+			else
+				selectionContents = selection.cloneContents();
+
+			if (postAncestor)
+			{
+				// Clone tree upwards. Some BBCode requires more context
+				// than just the current node, like lists.
+				while(selectionAncestor != postAncestor)
+				{
+					selectionAncestor = selectionAncestor.parentNode;
+					var newSelectionContents = selectionAncestor.cloneNode(false);
+					newSelectionContents.appendChild(selectionContents);
+					selectionContents = newSelectionContents;
+				}
 			}
+
+			var selectedText = trim(treeToBBCode(selectionContents));
+
+			//if( selectedText ){
+				//var textarea = rule.getDestination();
+			var textarea = document.querySelector('#postmodify').message;
+			var newText = (textarea.value?textarea.value+'\n':'') +
+				startTag+selectedText+endTag+'\n';
+			textarea.value = newText;
+			newText = textarea.value;//reading again, to get normalized white-space
+			textarea.setSelectionRange(newText.length,newText.length);
+			textarea.blur(); //needed for Webkit/Blink
+			textarea.focus();
+		}
+		else{
+				this._warning.style.display='block';
+				setTimeout(function(warning){
+					warning.style.display = 'none';
+				},1000,this._warning);
 		}
 	}
-	
+
 	var quotebuttons = document.querySelectorAll('.quote_button');
 	
 	for (var i=0; i<quotebuttons.length; i++) {
@@ -278,91 +349,34 @@ function initializeQuickQuote() {
 		var link = document.createElement('a');
 		link.className = 'linklevel1 quote_button';
 		link.href = '';
-		link.textContent = 'Quick Quote';
-		
+		link.textContent = (typeof quickQuote !== 'undefined' && typeof quickQuote.txt !== 'undefined') ? quickQuote.txt : 'Quick Quote';
+
 		var username = (quotebuttons[i].parentNode.parentNode.parentNode.previousElementSibling.querySelector('.name').textContent).trim();
 		var quote_msg = 'msg=' + quotebutton.href.split('?')[1].split(';')[1].split('=')[1];
 		var time_unix = quotebutton.parentNode.parentNode.parentNode.querySelector('time').getAttribute('data-timestamp');
-		//console.log(time_unix);
+
 		link.startTag = '[quote'+(username?' author='+username:'')+((quote_msg&&time_unix)?' link='+quote_msg+' date='+time_unix:'')+']';
-		//var startTag = '[QUOTE]';
 		link.endTag = '[/quote]';
 		
 		
-		            //message when there's no text selected
-            var warning = link.appendChild(document.createElement('span'));
-            warning.textContent = 'Please select some text !';
-            warning.style.border='1px solid orange';
-            warning.style.background='gold';
-            warning.style.padding='0.4em';
-            warning.style.position='absolute';
-            warning.style.marginLeft='8.6em';
-            warning.style.display='none';
-            link._warning = warning;
-		
-		
-		link.addEventListener('click',function(e){
-			e.preventDefault();
-			
-			var startTag = e.target.startTag;
-			var endTag = e.target.endTag;
+		//message when there's no text selected
+		var warning = link.appendChild(document.createElement('span'));
+		warning.textContent = 'Please select some text !';
+		warning.style.border='1px solid orange';
+		warning.style.background='gold';
+		warning.style.padding='0.4em';
+		warning.style.position='absolute';
+		warning.style.marginLeft='8.6em';
+		warning.style.display='none';
+		link._warning = warning;
 
-			// isCollapsed is true for an empty selection
-			var selection = (window.getSelection().isCollapsed ? null : window.getSelection().getRangeAt(0));
-			
-			if( selection ){
-				var selectionAncestor = selection.commonAncestorContainer;
-				var postAncestor = selectionAncestor.selectSingleNode('ancestor-or-self::div[contains(@class,"post")]');
-				//var postAncestor = getPostAncestor(selectionAncestor);
-				setHiddenFlag(selectionAncestor);
+		link.addEventListener('click',executeQuickQuote,false);
 
-				if (selectionAncestor.nodeType != 3 && selectionAncestor.nodeType != 4)
-				{
-					var selectionContents = selectionAncestor.cloneNode(false);
-					selectionContents.appendChild(selection.cloneContents());
-				}
-				else
-					var selectionContents = selection.cloneContents();
-
-				if (postAncestor)
-				{
-					// Clone tree upwards. Some BBCode requires more context
-					// than just the current node, like lists.
-					while(selectionAncestor != postAncestor)
-					{
-						selectionAncestor = selectionAncestor.parentNode;
-						var newSelectionContents = selectionAncestor.cloneNode(false);
-						newSelectionContents.appendChild(selectionContents);
-						selectionContents = newSelectionContents;
-					}
-				}
-
-				var selectedText = trim(treeToBBCode(selectionContents));
-
-				//if( selectedText ){
-					//var textarea = rule.getDestination();
-				var textarea = document.querySelector('#postmodify').message;
-				var newText = (textarea.value?textarea.value+'\n':'') +
-					startTag+selectedText+endTag+'\n';
-				textarea.value = newText;
-				newText = textarea.value;//reading again, to get normalized white-space
-				textarea.setSelectionRange(newText.length,newText.length);
-				textarea.blur(); //needed for Webkit/Blink
-				textarea.focus();
-			}
-			else{
-					this._warning.style.display='block';
-					setTimeout(function(warning){
-						warning.style.display = 'none';
-					},1000,this._warning);
-			}
-		},false);
-		
-		
 		li.appendChild(link);
-		console.log(quotebutton.parentNode)
 		quotebutton.parentNode.parentNode.insertBefore(li, quotebutton.parentNode.nextSibling);
 	}
 }
 
 document.addEventListener('DOMContentLoaded', initializeQuickQuote, false);
+
+var quickQuote = {}; // for attaching a translation string using quickQuote.txt