region.js.coffee in mercury-rails-0.3.1

- old
+ new

@@ -4,46 +4,43 @@
   constructor: (@element, @window, @options = {}) ->
     @type = 'region' unless @type
     Mercury.log("building #{@type}", @element, @options)
 
     @document = @window.document
-    @name = @element.attr('id')
+    @name = @element.attr(Mercury.config.regions.identifier)
     @history = new Mercury.HistoryBuffer()
     @build()
     @bindEvents()
     @pushHistory()
+    @element.data('region', @)
 
 
   build: ->
 
 
   focus: ->
 
 
   bindEvents: ->
-    Mercury.bind 'mode', (event, options) =>
-      @togglePreview() if options.mode == 'preview'
+    Mercury.on 'mode', (event, options) => @togglePreview() if options.mode == 'preview'
 
-    Mercury.bind 'focus:frame', =>
-      return if @previewing
-      return unless Mercury.region == @
+    Mercury.on 'focus:frame', =>
+      return if @previewing || Mercury.region != @
       @focus()
 
-    Mercury.bind 'action', (event, options) =>
-      return if @previewing
-      return unless Mercury.region == @
+    Mercury.on 'action', (event, options) =>
+      return if @previewing || Mercury.region != @
       @execCommand(options.action, options) if options.action
 
-    @element.mousemove (event) =>
-      return if @previewing
-      return unless Mercury.region == @
+    @element.on 'mousemove', (event) =>
+      return if @previewing || Mercury.region != @
       snippet = jQuery(event.target).closest('.mercury-snippet')
       if snippet.length
         @snippet = snippet
         Mercury.trigger('show:toolbar', {type: 'snippet', snippet: @snippet})
 
-    @element.mouseout (event) =>
+    @element.on 'mouseout', =>
       return if @previewing
       Mercury.trigger('hide:toolbar', {type: 'snippet', immediately: false})
 
 
   content: (value = null, filterSnippets = false) ->
@@ -53,35 +50,35 @@
       # sanitize the html before we return it
       container = jQuery('<div>').appendTo(@document.createDocumentFragment())
       container.html(@element.html().replace(/^\s+|\s+$/g, ''))
 
       # replace snippet contents to be an identifier
-      if filterSnippets then for snippet, index in container.find('.mercury-snippet')
+      if filterSnippets then for snippet in container.find('.mercury-snippet')
         snippet = jQuery(snippet)
         snippet.attr({contenteditable: null, 'data-version': null})
         snippet.html("[#{snippet.data('snippet')}]")
 
       return container.html()
 
 
   togglePreview: ->
     if @previewing
       @previewing = false
-      @element.addClass(Mercury.config.regionClass).removeClass("#{Mercury.config.regionClass}-preview")
+      @element.addClass(Mercury.config.regions.className).removeClass("#{Mercury.config.regions.className}-preview")
       @focus() if Mercury.region == @
     else
       @previewing = true
-      @element.addClass("#{Mercury.config.regionClass}-preview").removeClass(Mercury.config.regionClass)
+      @element.addClass("#{Mercury.config.regions.className}-preview").removeClass(Mercury.config.regions.className)
       Mercury.trigger('region:blurred', {region: @})
 
 
   execCommand: (action, options = {}) ->
     @focus()
     @pushHistory() unless action == 'redo'
 
     Mercury.log('execCommand', action, options.value)
-    Mercury.changes = true
+    Mercury.changes = true unless options.already_handled
 
 
   pushHistory: ->
     @history.push(@content())
 
@@ -93,11 +90,18 @@
       snippet.setVersion(jQuery(element).data('version'))
       snippets[snippet.identity] = snippet.serialize()
     return snippets
 
 
+  dataAttributes: ->
+    data = {}
+    data[attr] = @element.attr('data-' + attr) for attr in Mercury.config.regions.dataAttributes
+    return data
+
+
   serialize: ->
     return {
       type: @type
+      data: @dataAttributes()
       value: @content(null, true)
       snippets: @snippets()
     }