Browse Source

Fixed firefox paste

master
Igor Zhukov 11 years ago
parent
commit
91d9bb661c
  1. 2
      app/index.html
  2. 4
      app/js/services.js
  3. 2
      app/vendor/jquery.emojiarea/jquery.emojiarea.js

2
app/index.html

@ -34,7 +34,7 @@
<script type="text/javascript" src="vendor/console-polyfill/console-polyfill.js?1"></script> <script type="text/javascript" src="vendor/console-polyfill/console-polyfill.js?1"></script>
<script type="text/javascript" src="vendor/jquery/jquery.min.js"></script> <script type="text/javascript" src="vendor/jquery/jquery.min.js"></script>
<script type="text/javascript" src="vendor/jquery.nanoscroller/nanoscroller.js"></script> <script type="text/javascript" src="vendor/jquery.nanoscroller/nanoscroller.js"></script>
<script type="text/javascript" src="vendor/jquery.emojiarea/jquery.emojiarea.js?1"></script> <script type="text/javascript" src="vendor/jquery.emojiarea/jquery.emojiarea.js?2"></script>
<script type="text/javascript" src="vendor/angular/angular.js?1"></script> <script type="text/javascript" src="vendor/angular/angular.js?1"></script>
<script type="text/javascript" src="vendor/angular/angular-route.js?1"></script> <script type="text/javascript" src="vendor/angular/angular-route.js?1"></script>

4
app/js/services.js

@ -2040,10 +2040,6 @@ angular.module('myApp.services', [])
notificationsClear(); notificationsClear();
}; };
// console.log('notify', notification);
notification.show();
notificationsShown[key] = notification; notificationsShown[key] = notification;
}; };

2
app/vendor/jquery.emojiarea/jquery.emojiarea.js vendored

@ -287,7 +287,7 @@
}, 0); }, 0);
if (text.length) { if (text.length) {
document.execCommand('insertText', false, text); document.execCommand('insertText', false, text);
return cancelEvent(); return cancelEvent(e);
} }
return true; return true;
} }

Loading…
Cancel
Save