fixes #12 and #13

Author: davidegiacometti

assets/javascripts/view_layouts_base_body_bottom_markdown.js

@@ -23,7 +23,7 @@ function styleSelectedText(textarea, prepend, append) {
 
 $(document).keydown(function (e) {
     if ($(document.activeElement).hasClass('wiki-edit')) {
-        if (e.ctrlKey || e.metaKey) {
+        if ((e.ctrlKey || e.metaKey) && !e.shiftKey) {
             // CTRL/CMD + B
             if (e.keyCode == 66) {
                 styleSelectedText($(document.activeElement), '**');

assets/javascripts/view_layouts_base_body_bottom_questionmark.js

@@ -1,8 +1,9 @@
 // Question Mark.
-$questionMarkModalRoot = $('<div class="question-mark-modal-root"></div>');
+var baseUrl = $("head link[rel='stylesheet']:first").attr('href').replace(/stylesheets.+$/, '');
+$questionMarkModalRoot = $('<div class="question-mark-modal-root" />');
 $questionMarkModal = $('<div class="question-mark-modal"><span aria-label="Close" aria-role="button" class="question-mark--close"/></div>')
 $questionMarkModalRoot.append($questionMarkModal);
-$questionMarkModal.append('<iframe width="500px" height="500px" src="' + window.location.origin + '/redmine_shortcuts/help"></iframe>');
+$questionMarkModal.append('<iframe width="500px" height="500px" src="' + baseUrl + 'redmine_shortcuts/help" />');
 $('body').append($questionMarkModalRoot);
 $(document).on('keypress', function(e) {
   e = e || window.event;

assets/javascripts/view_layouts_base_body_bottom_textile.js

@@ -23,7 +23,7 @@ function styleSelectedText(textarea, prepend, append) {
 
 $(document).keydown(function (e) {
     if ($(document.activeElement).hasClass('wiki-edit')) {
-        if (e.ctrlKey || e.metaKey) {
+        if ((e.ctrlKey || e.metaKey) && !e.shiftKey) {
             // CTRL/CMD + B
             if (e.keyCode == 66) {
                 styleSelectedText($(document.activeElement), '*');

init.rb

@@ -4,7 +4,7 @@
   name 'Redmine Shortcuts'
   author 'Davide Giacometti'
   description 'Provides useful keyboard shortcuts'
-  version '0.5.1'
+  version '0.5.2'
   url 'https://github.com/davidegiacometti/redmine_shortcuts'
   author_url 'https://github.com/davidegiacometti'