Commit 8858bab9 authored by John Crepezzi's avatar John Crepezzi
Browse files

Merge branch 'master' into production

parents 82c58c5c afb0c332

static/application.js

+2 −2
Original line number Diff line number Diff line
@@ -308,9 +308,9 @@ haste.prototype.configureButtons = function() { 
      $where: $('#box2 .twitter'),

      label: 'Twitter',

      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() {

        window.open('https://twitter.com/share?url=' + encodeURI(window.location.href));

      }