Merge branch 'master' into production
This commit is contained in:
		
						commit
						8858bab985
					
				| @ -308,9 +308,9 @@ haste.prototype.configureButtons = function() { | |||||||
|       $where: $('#box2 .twitter'), |       $where: $('#box2 .twitter'), | ||||||
|       label: 'Twitter', |       label: 'Twitter', | ||||||
|       shortcut: function(evt) { |       shortcut: function(evt) { | ||||||
|         return _this.options.twitter && _this.doc.locked && evt.ctrlKey && evt.keyCode == 84; |         return _this.options.twitter && _this.doc.locked && evt.shiftKey && evt.ctrlKey && evt.keyCode == 84; | ||||||
|       }, |       }, | ||||||
|       shortcutDescription: 'control + t', |       shortcutDescription: 'control + shift + t', | ||||||
|       action: function() { |       action: function() { | ||||||
|         window.open('https://twitter.com/share?url=' + encodeURI(window.location.href)); |         window.open('https://twitter.com/share?url=' + encodeURI(window.location.href)); | ||||||
|       } |       } | ||||||
|  | |||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user
	 John Crepezzi
						John Crepezzi