Fix merge error that disabled contact drag'n'drop

Thomas Bruederli

2014-08-19 fc52af24f1418d6590a2d37a0d8cc31b123e38f6

 program/js/tiny_mce/plugins/nonbreaking/editor_plugin_src.js

@@ -25,11 +25,12 @@


         if (ed.getParam('nonbreaking_force_tab')) {

            ed.onKeyDown.add(function(ed, e) {

               if (tinymce.isIE && e.keyCode == 9) {

               if (e.keyCode == 9) {

                  e.preventDefault();

	
                  ed.execCommand('mceNonBreaking');

                  ed.execCommand('mceNonBreaking');

                  ed.execCommand('mceNonBreaking');

                  tinymce.dom.Event.cancel(e);

               }

            });

         }