markitup-rails 1.0.1 → 1.1.0

data/lib/markitup/rails/version.rb

@@ -1,5 +1,5 @@
 module Markitup
   module Rails
-    VERSION = "1.0.1"
+    VERSION = "1.1.0"
   end
 end

data/vendor/assets/javascripts/markitup.js

@@ -12,10 +12,10 @@
 // to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 // copies of the Software, and to permit persons to whom the Software is
 // furnished to do so, subject to the following conditions:
-//
+// 
 // The above copyright notice and this permission notice shall be included in
 // all copies or substantial portions of the Software.
-//
+// 
 // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 // IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 // FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -31,7 +31,7 @@
 		if (typeof settings == 'string') {
 			method = settings;
 			params = extraSettings;
-		}
+		} 
 
 		options = {	id:						'',
 					nameSpace:				'',
@@ -66,6 +66,35 @@
 			});
 		}
 
+		// Quick patch to keep compatibility with jQuery 1.9
+		var uaMatch = function(ua) {
+			ua = ua.toLowerCase();
+
+			var match = /(chrome)[ \/]([\w.]+)/.exec(ua) ||
+				/(webkit)[ \/]([\w.]+)/.exec(ua) ||
+				/(opera)(?:.*version|)[ \/]([\w.]+)/.exec(ua) ||
+				/(msie) ([\w.]+)/.exec(ua) ||
+				ua.indexOf("compatible") < 0 && /(mozilla)(?:.*? rv:([\w.]+)|)/.exec(ua) ||
+				[];
+
+			return {
+				browser: match[ 1 ] || "",
+				version: match[ 2 ] || "0"
+			};
+		};
+		var matched = uaMatch( navigator.userAgent );
+		var browser = {};
+
+		if (matched.browser) {
+			browser[matched.browser] = true;
+			browser.version = matched.version;
+		}
+		if (browser.chrome) {
+			browser.webkit = true;
+		} else if (browser.webkit) {
+			browser.safari = true;
+		}
+
 		return this.each(function() {
 			var $$, textarea, levels, scrollPosition, caretPosition, caretOffset,
 				clicked, hash, header, footer, previewWindow, template, iFrame, abort;
@@ -87,7 +116,7 @@
 					case 'insert':
 						markup(params);
 					break;
-					default:
+					default: 
 						$.error('Method ' +  method + ' does not exist on jQuery.markItUp');
 				}
 				return;
@@ -126,7 +155,7 @@
 				footer = $('<div class="markItUpFooter"></div>').insertAfter($$);
 
 				// add the resize handle after textarea
-				if (options.resizeHandle === true && $.browser.safari !== true) {
+				if (options.resizeHandle === true && browser.safari !== true) {
 					resizeHandle = $('<div class="markItUpResizeHandle"></div>')
 						.insertAfter($$)
 						.bind("mousedown.markItUp", function(e) {
@@ -146,7 +175,7 @@
 
 				// listen key events
 				$$.bind('keydown.markItUp', keyPressed).bind('keyup', keyPressed);
-
+				
 				// bind an event to catch external calls
 				$$.bind("insertion.markItUp", function(e, settings) {
 					if (settings.target !== false) {
@@ -185,8 +214,8 @@
 						li = $('<li class="markItUpButton markItUpButton'+t+(i)+' '+(button.className||'')+'"><a href="" '+key+' title="'+title+'">'+(button.name||'')+'</a></li>')
 						.bind("contextmenu.markItUp", function() { // prevent contextmenu on mac and allow ctrl+click
 							return false;
-						}).bind('click.markItUp', function() {
-							return false;
+						}).bind('click.markItUp', function(e) {
+							e.preventDefault();
 						}).bind("focusin.markItUp", function(){
                             $$.focus();
 						}).bind('mouseup', function() {
@@ -209,7 +238,7 @@
 							$(li).addClass('markItUpDropMenu').append(dropMenus(button.dropMenu));
 						}
 					}
-				});
+				}); 
 				levels.pop();
 				return ul;
 			}
@@ -264,7 +293,7 @@
 				var openBlockWith 		= prepare(clicked.openBlockWith);
 				var closeBlockWith 		= prepare(clicked.closeBlockWith);
 				var multiline 			= clicked.multiline;
-
+				
 				if (replaceWith !== "") {
 					block = openWith + replaceWith + closeWith;
 				} else if (selection === '' && placeHolder !== '') {
@@ -273,11 +302,11 @@
 					string = string || selection;
 
 					var lines = [string], blocks = [];
-
+					
 					if (multiline === true) {
 						lines = string.split(/\r?\n/);
 					}
-
+					
 					for (var l = 0; l < lines.length; l++) {
 						line = lines[l];
 						var trailingSpaces;
@@ -287,17 +316,19 @@
 							blocks.push(openWith + line + closeWith);
 						}
 					}
-
+					
 					block = blocks.join("\n");
 				}
 
 				block = openBlockWith + block + closeBlockWith;
 
-				return {	block:block,
-							openWith:openWith,
-							replaceWith:replaceWith,
+				return {	block:block, 
+							openBlockWith:openBlockWith,
+							openWith:openWith, 
+							replaceWith:replaceWith, 
 							placeHolder:placeHolder,
-							closeWith:closeWith
+							closeWith:closeWith,
+							closeBlockWith:closeBlockWith
 					};
 			}
 
@@ -306,13 +337,13 @@
 				var len, j, n, i;
 				hash = clicked = button;
 				get();
-				$.extend(hash, {	line:"",
+				$.extend(hash, {	line:"", 
 						 			root:options.root,
-									textarea:textarea,
-									selection:(selection||''),
+									textarea:textarea, 
+									selection:(selection||''), 
 									caretPosition:caretPosition,
-									ctrlKey:ctrlKey,
-									shiftKey:shiftKey,
+									ctrlKey:ctrlKey, 
+									shiftKey:shiftKey, 
 									altKey:altKey
 								}
 							);
@@ -321,7 +352,7 @@
 				prepare(clicked.beforeInsert);
 				if ((ctrlKey === true && shiftKey === true) || button.multiline === true) {
 					prepare(clicked.beforeMultiInsert);
-				}
+				}			
 				$.extend(hash, { line:1 });
 
 				if ((ctrlKey === true && shiftKey === true)) {
@@ -337,7 +368,7 @@
 
 					string = { block:lines.join('\n')};
 					start = caretPosition;
-					len = string.block.length + (($.browser.opera) ? n-1 : 0);
+					len = string.block.length + ((browser.opera) ? n-1 : 0);
 				} else if (ctrlKey === true) {
 					string = build(selection);
 					start = caretPosition + string.openWith.length;
@@ -357,9 +388,9 @@
 				}
 				if ((selection === '' && string.replaceWith === '')) {
 					caretOffset += fixOperaBug(string.block);
-
-					start = caretPosition + string.openWith.length;
-					len = string.block.length - string.openWith.length - string.closeWith.length;
+					
+					start = caretPosition + string.openBlockWith.length + string.openWith.length;
+					len = string.block.length - string.openBlockWith.length - string.openWith.length - string.closeWith.length - string.closeBlockWith.length;
 
 					caretOffset = $$.val().substring(caretPosition,  $$.val().length).length;
 					caretOffset -= fixOperaBug($$.val().substring(0, caretPosition));
@@ -385,30 +416,30 @@
 
 				// refresh preview if opened
 				if (previewWindow && options.previewAutoRefresh) {
-					refreshPreview();
+					refreshPreview(); 
 				}
-
+																									
 				// reinit keyevent
 				shiftKey = altKey = ctrlKey = abort = false;
 			}
 
 			// Substract linefeed in Opera
 			function fixOperaBug(string) {
-				if ($.browser.opera) {
+				if (browser.opera) {
 					return string.length - string.replace(/\n*/g, '').length;
 				}
 				return 0;
 			}
 			// Substract linefeed in IE
 			function fixIeBug(string) {
-				if ($.browser.msie) {
+				if (browser.msie) {
 					return string.length - string.replace(/\r*/g, '').length;
 				}
 				return 0;
 			}
-
+				
 			// add markup
-			function insert(block) {
+			function insert(block) {	
 				if (document.selection) {
 					var newSelection = document.selection.createRange();
 					newSelection.text = block;
@@ -421,13 +452,13 @@
 			function set(start, len) {
 				if (textarea.createTextRange){
 					// quick fix to make it work on Opera 9.5
-					if ($.browser.opera && $.browser.version >= 9.5 && len == 0) {
+					if (browser.opera && browser.version >= 9.5 && len == 0) {
 						return false;
 					}
 					range = textarea.createTextRange();
 					range.collapse(true);
-					range.moveStart('character', start);
-					range.moveEnd('character', len);
+					range.moveStart('character', start); 
+					range.moveEnd('character', len); 
 					range.select();
 				} else if (textarea.setSelectionRange ){
 					textarea.setSelectionRange(start, start + len);
@@ -443,7 +474,7 @@
 				scrollPosition = textarea.scrollTop;
 				if (document.selection) {
 					selection = document.selection.createRange().text;
-					if ($.browser.msie) { // ie
+					if (browser.msie) { // ie
 						var range = document.selection.createRange(), rangeCopy = range.duplicate();
 						rangeCopy.moveToElementText(textarea);
 						caretPosition = -1;
@@ -458,7 +489,7 @@
 					caretPosition = textarea.selectionStart;
 
 					selection = textarea.value.substring(caretPosition, textarea.selectionEnd);
-				}
+				} 
 				return selection;
 			}
 
@@ -480,7 +511,7 @@
 							iFrame.insertAfter(footer);
 						} else {
 							iFrame.insertBefore(header);
-						}
+						}	
 						previewWindow = iFrame[iFrame.length - 1].contentWindow || frame[iFrame.length - 1];
 					}
 				} else if (altKey === true) {
@@ -492,7 +523,7 @@
 					previewWindow = iFrame = false;
 				}
 				if (!options.previewAutoRefresh) {
-					refreshPreview();
+					refreshPreview(); 
 				}
 				if (options.previewInWindow) {
 					previewWindow.focus();
@@ -510,7 +541,7 @@
 					options.previewHandler( $$.val() );
 				} else if (options.previewParser && typeof options.previewParser === 'function') {
 					var data = options.previewParser( $$.val() );
-					writeInPreview(localize(data, 1) );
+					writeInPreview(localize(data, 1) ); 
 				} else if (options.previewParserPath !== '') {
 					$.ajax({
 						type: 'POST',
@@ -519,7 +550,7 @@
 						url: options.previewParserPath,
 						data: options.previewParserVar+'='+encodeURIComponent($$.val()),
 						success: function(data) {
-							writeInPreview( localize(data, 1) );
+							writeInPreview( localize(data, 1) ); 
 						}
 					});
 				} else {
@@ -536,25 +567,25 @@
 				}
 				return false;
 			}
-
+			
 			function writeInPreview(data) {
 				if (options.previewInElement) {
 					$(options.previewInElement).html(data);
-				} else if (previewWindow && previewWindow.document) {
+				} else if (previewWindow && previewWindow.document) {			
 					try {
 						sp = previewWindow.document.documentElement.scrollTop
 					} catch(e) {
 						sp = 0;
-					}
+					}	
 					previewWindow.document.open();
 					previewWindow.document.write(data);
 					previewWindow.document.close();
 					previewWindow.document.documentElement.scrollTop = sp;
 				}
 			}
-
+			
 			// set keys pressed
-			function keyPressed(e) {
+			function keyPressed(e) { 
 				shiftKey = e.shiftKey;
 				altKey = e.altKey;
 				ctrlKey = (!(e.altKey && e.ctrlKey)) ? (e.ctrlKey || e.metaKey) : false;
@@ -586,7 +617,7 @@
 					}
 					if (e.keyCode === 9) { // Tab key
 						if (shiftKey == true || ctrlKey == true || altKey == true) {
-							return false;
+							return false; 
 						}
 						if (caretOffset !== -1) {
 							get();

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: markitup-rails
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-19 00:00:00.000000000 Z
+date: 2013-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails