bug fixes to wysiwyg

nodeonly · Jun 10, 2015 · d3be2c9 · d3be2c9
1 parent 61f603c
commit d3be2c9
Showing 1 changed file with 9 additions and 4 deletions.
diff --git a/public/js/angular/directives/wysiwyg.js b/public/js/angular/directives/wysiwyg.js
@@ -125,6 +125,7 @@
         };
 
         scope.showInsertMediaModal = function() {
+          angular.element(element).find('[contenteditable]').focus();
           scope.saveSelection();
           angular.element(element).find('[insert-media-modal]').modal('show');
         };
@@ -135,12 +136,11 @@
         };
 
         scope.insertMedia = function() {
-          angular.element(element).find('[insert-media-modal]').modal('hide');
-          scope.restoreSelection();
-
           var mediaFormat = scope.getMediaFormat();
           scope.formatAction('inserthtml', '<div>^media_display_' + scope.wysiwyg.selectedMediaItem._id + mediaFormat + '^</div>');
-          scope.saveSelection();
+
+          angular.element(element).find('[insert-media-modal]').modal('hide');
+          scope.restoreSelection();
         };
 
         scope.getMediaFormat = function() {
@@ -240,6 +240,11 @@
             return;
           }
 
+          if(scope.wysiwyg.currentView === 'html') {
+            scope.wysiwyg.layout = scope.layout.toString();
+            return;
+          }
+
           var self = this;
 
           var tempEditable = angular.element(element).find('.temp_editable');