Browse Source

Merged dLog replacement

master
Igor Zhukov 11 years ago
parent
commit
e81fd52078
  1. 2
      app/index.html
  2. 3
      app/js/directives.js
  3. 0
      app/vendor/console-polyfill/console-polyfill.js

2
app/index.html

@ -21,7 +21,7 @@
<div ng-view></div> <div ng-view></div>
<script type="text/javascript" src="vendor/console-polyfill.js"></script> <script type="text/javascript" src="vendor/console-polyfill/console-polyfill.js"></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"></script> <script type="text/javascript" src="vendor/jquery.emojiarea/jquery.emojiarea.js"></script>

3
app/js/directives.js

@ -282,7 +282,6 @@ angular.module('myApp.directives', ['myApp.filters'])
if (richTextarea) { if (richTextarea) {
scope.$watch('draftMessage.text', function (newVal) { scope.$watch('draftMessage.text', function (newVal) {
console.log('on update', newVal);
if (!newVal.length && !messageField.value.length) { if (!newVal.length && !messageField.value.length) {
$timeout(function () { $timeout(function () {
updateField(); updateField();
@ -292,8 +291,6 @@ angular.module('myApp.directives', ['myApp.filters'])
} }
function updateField () { function updateField () {
console.log(scope.draftMessage);
console.log('update field', scope.draftMessage.text);
$(richTextarea).text(scope.draftMessage.text || ''); $(richTextarea).text(scope.draftMessage.text || '');
} }

0
app/vendor/console-polyfill.js → app/vendor/console-polyfill/console-polyfill.js vendored

Loading…
Cancel
Save