Insertion arrow behavior update

src/plugins/oer/assorted/lib/image.coffee

@@ -20,7 +20,7 @@ define [
 ) ->
 
   # This will be prefixed with Aloha.settings.baseUrl
-  WARNING_IMAGE_PATH = '/../plugins/oer/image/img/warning.png'
+  WARNING_IMAGE_PATH = '/../plugins/oer/assorted/img/warning.png'
 
   DIALOG_HTML_CONTAINER = '''
       <form class="plugin image modal hide fade form-horizontal" id="linkModal" tabindex="-1" role="dialog" aria-labelledby="linkModalLabel" aria-hidden="true" data-backdrop="false" />'''
@@ -268,6 +268,9 @@ define [
       deferred.reject()
       dialog.modal('hide')
 
+    dialog.on 'hidden', () ->
+      deferred.reject()
+
     dialog.modal {show: true}
 
     return deferred.promise()
@@ -388,11 +391,13 @@ define [
     return deferred.promise()
 
   insertImage = () ->
-    Figure.insertPlaceholder()
+    marker = Figure.insertPlaceholder()
 
     showCreateDialog().then (image) ->
-      Figure.insertOverPlaceholder(image)
+      Figure.insertOverPlaceholder(image, marker)
       showModalDialog2(image)
+    .fail () ->
+      marker.remove()
 
   $('body').bind 'aloha-image-resize', ->
     Aloha.activeEditable.smartContentChange({type: 'block-change'})

src/plugins/oer/figure/lib/figure-plugin.coffee

@@ -28,13 +28,13 @@ define [
     selector: 'figure'
     insertPlaceholder: ->
       semanticBlock.insertPlaceholder()
-    insertOverPlaceholder: ($content) ->
+    insertOverPlaceholder: ($content, $placeholder) ->
       $figure = $('<figure>')
         .append('<div class="title">')
         .append($content)
         .append('<figcaption>')
 
-      semanticBlock.insertOverPlaceholder($figure)
+      semanticBlock.insertOverPlaceholder($figure, $placeholder)
     init: () ->
       plugin = @
       semanticBlock.register(plugin)

src/plugins/oer/media-embed/lib/media-embed-plugin.coffee

@@ -75,9 +75,11 @@ define [
 
   embed = Plugin.create 'mediaEmbed',
 
+    placeholder: null # Keep track of an inserted place holder
+
     ignore: '[data-type="title"],[data-type="alternates"],.noembed-embed,.noembed-embed *'
 
-    create: (thing) =>
+    create: (thing) ->
       $thing = $(TEMPLATE)
 
       $thing.find('[data-type="title"]').text(thing.title)
@@ -91,7 +93,8 @@ define [
       $thing.find('[data-type="alternates"]').html(thing.html)
 
       $caption = $thing.find('figcaption').remove()
-      $figure  = Figure.insertOverPlaceholder($thing.contents())
+      $figure  = Figure.insertOverPlaceholder($thing.contents(), @placeholder)
+      @placeholder = null
 
       $figure.find('figcaption').find('.aloha-editable').html($caption.contents())
 
@@ -110,12 +113,12 @@ define [
 
       $dialog.find('input[name="figureTitle"]').val(thing.title) if thing.title
 
-      $dialog.find('.cancel').off('click').click (e) ->
+      $dialog.find('.cancel').off('click').on 'click', (e) ->
         e.preventDefault(true)
         $dialog.modal 'hide'
         embed.showDialog()
 
-      $dialog.find('.embed').off('.embed').click (e) ->
+      $dialog.find('.embed').off('.embed').on 'click', (e) ->
         e.preventDefault(true)
         $dialog.modal 'hide'
         embed.create
@@ -124,6 +127,13 @@ define [
           author: thing.author
           authorUrl: thing.authorUrl
 
+      $dialog.find('[data-dismiss]').on 'click', (e) ->
+        embed.placeholder.remove()
+        embed.placeholder = null
+      $dialog.on 'keyup.dismiss.modal', (e) =>
+        if e.which == 27
+          @placeholder.remove()
+          @placeholder = null
       $dialog.modal {show: true}
 
     embedByUrl: (url) =>
@@ -173,6 +183,13 @@ define [
           .fail ->
             $dialog.find('.text-error').show()
 
+      $dialog.find('[data-dismiss]').on 'click', (e) =>
+        @placeholder.remove()
+        @placeholder = null
+      $dialog.on 'keyup.dismiss.modal', (e) =>
+        if e.which == 27
+          @placeholder.remove()
+          @placeholder = null
       $dialog.modal 'show'
 
     init: () ->
@@ -184,7 +201,7 @@ define [
       # For legacy toolbars
       UI.adopt "insertMediaEmbed", Button,
         click: =>
-          Figure.insertPlaceholder()
+          @placeholder = Figure.insertPlaceholder()
           @showDialog()
 
       semanticBlock.register(this)

src/plugins/oer/semanticblock/css/semanticblock-plugin.css

@@ -321,3 +321,8 @@
 .aloha-oer-block .aloha-editable {
     min-height: 20px;
 }
+
+.oer-placeholder:before {
+    content: url(../img/insert-here-arrow.png);
+    opacity: 0.25;
+}

src/plugins/oer/semanticblock/lib/semanticblock-plugin.coffee

@@ -387,14 +387,12 @@ define ['aloha', 'block/block', 'block/blockmanager', 'aloha/plugin', 'aloha/plu
               refreshPositions: true
 
     insertPlaceholder: ->
-      $('.oer-placeholder').remove()
-
+      placeholder = $('<span class="aloha-ephemera oer-placeholder"></span>')
       range = Aloha.Selection.getRangeObject()
-      GENTICS.Utils.Dom.insertIntoDOM $('<span class="aloha-ephemera oer-placeholder"></span>'), range, Aloha.activeEditable.obj
+      GENTICS.Utils.Dom.insertIntoDOM placeholder, range, Aloha.activeEditable.obj
+      return placeholder
 
     insertOverPlaceholder: ($element, $placeholder) ->
-      $placeholder = $('.oer-placeholder') if not $placeholder?.length
-
       $element.addClass 'semantic-temp'
       $placeholder.replaceWith($element)
       $element = Aloha.jQuery('.semantic-temp').removeClass('semantic-temp')