kiteditor 1.0.12 → 1.0.13

data/spec/javascripts/mercury/toolbar.expander_spec.js.coffee

@@ -1,7 +1,8 @@
 describe "Mercury.Toolbar.Expander", ->
 
+  template 'mercury/toolbar.expander.html'
+
   beforeEach ->
-    fixture.load('mercury/toolbar.expander.html')
     @container = $('#expander_container')
 
   afterEach ->
@@ -12,20 +13,20 @@ describe "Mercury.Toolbar.Expander", ->
   describe "constructor", ->
 
     beforeEach ->
-      @expander = new Mercury.Toolbar.Expander('foo', {appendTo: fixture.el, for: @container})
+      @expander = new Mercury.Toolbar.Expander('foo', {appendTo: '#test', for: @container})
 
     it "expects a name, and options", ->
       html = $('<div>').html(@expander).html()
       expect(html).toContain('class="mercury-palette mercury-expander mercury-foo-expander"')
       expect(html).toMatch(/style="display:\s?none/)
-      expect($('.mercury-toolbar-expander', fixture.el).length).toEqual(1)
+      expect($('#test .mercury-toolbar-expander').length).toEqual(1)
 
 
   describe "#build", ->
 
     beforeEach ->
       @resizeSpy = spyOn(Mercury.Toolbar.Expander.prototype, 'windowResize').andCallFake(=>)
-      @expander = new Mercury.Toolbar.Expander('foo', {appendTo: fixture.el, for: @container})
+      @expander = new Mercury.Toolbar.Expander('foo', {appendTo: '#test', for: @container})
 
     it "sets the whitespace of the container to normal", ->
       expect(@container.css('whiteSpace')).toEqual('normal')
@@ -36,7 +37,7 @@ describe "Mercury.Toolbar.Expander", ->
       expect(html).toMatch(/style="display:\s?none/)
 
     it "builds a trigger button", ->
-      expect($('.mercury-toolbar-expander', fixture.el).length).toEqual(1)
+      expect($('#test .mercury-toolbar-expander').length).toEqual(1)
 
     it "calls windowResize", ->
       expect(@resizeSpy.callCount).toEqual(1)
@@ -46,7 +47,7 @@ describe "Mercury.Toolbar.Expander", ->
 
     beforeEach ->
       $('.mercury-button').data('expander', '<div data-button="test">expander</div>')
-      @expander = new Mercury.Toolbar.Expander('foo', {appendTo: fixture.el, for: @container})
+      @expander = new Mercury.Toolbar.Expander('foo', {appendTo: '#test', for: @container})
 
     describe "custom event: hide:dialogs", ->
 
@@ -80,30 +81,29 @@ describe "Mercury.Toolbar.Expander", ->
         button = $('#button2')
         spy = spyOn(button, 'click').andCallFake(=>)
         @container.find = -> button
-        @expander.appendTo(fixture.el)
+        @expander.appendTo('#test')
 
         jasmine.simulate.click($('.mercury-toolbar-expander').get(0))
         jasmine.simulate.click($('[data-button=test]').get(0))
         expect(spy.callCount).toEqual(1)
 
-
   describe "#windowResize", ->
 
     it "hides", ->
-      @expander = new Mercury.Toolbar.Expander('foo', {appendTo: fixture.el, for: @container})
+      @expander = new Mercury.Toolbar.Expander('foo', {appendTo: '#test', for: @container})
       @expander.css({display: 'block'})
 
       Mercury.trigger('resize')
       expect(@expander.css('display')).toEqual('none')
 
     it "shows the trigger if the container is wider than the window", ->
-      @expander = new Mercury.Toolbar.Expander('foo', {appendTo: fixture.el, for: @container})
+      @expander = new Mercury.Toolbar.Expander('foo', {appendTo: '#test', for: @container})
       Mercury.trigger('resize')
-      expect($('.mercury-toolbar-expander').css('display')).toEqual('none')
+      expect($('.mercury-toolbar-expander').css('display')).toEqual('block')
 
     it "hides the trigger if the container is narrower than the window", ->
       @container.css({width: '1px'})
-      @expander = new Mercury.Toolbar.Expander('foo', {appendTo: fixture.el, for: @container})
+      @expander = new Mercury.Toolbar.Expander('foo', {appendTo: '#test', for: @container})
       Mercury.trigger('resize')
       expect($('.mercury-toolbar-expander').css('display')).toEqual('none')
 
@@ -111,7 +111,7 @@ describe "Mercury.Toolbar.Expander", ->
   describe "#position", ->
 
     it "positions the element", ->
-      @expander = new Mercury.Toolbar.Expander('foo', {appendTo: fixture.el, for: @container})
+      @expander = new Mercury.Toolbar.Expander('foo', {appendTo: '#test', for: @container})
       @expander.appendTo('#positioned_container')
       jasmine.simulate.click($('.mercury-toolbar-expander').get(0))
 

data/spec/javascripts/mercury/toolbar_spec.js.coffee

@@ -1,7 +1,8 @@
 describe "Mercury.Toolbar", ->
 
+  template 'mercury/toolbar.html'
+
   beforeEach ->
-    fixture.load('mercury/toolbar.html')
     $.fx.off = true
     spyOn($, 'ajax').andCallFake (url, options) =>
       options.success('data') if options.success
@@ -15,10 +16,10 @@ describe "Mercury.Toolbar", ->
     beforeEach ->
       @buildSpy = spyOn(Mercury.Toolbar.prototype, 'build').andCallFake(=>)
       @bindEventsSpy = spyOn(Mercury.Toolbar.prototype, 'bindEvents').andCallFake(=>)
-      @toolbar = new Mercury.Toolbar({appendTo: fixture.el, foo: true})
+      @toolbar = new Mercury.Toolbar({appendTo: '#test', foo: true})
 
     it "accepts options as an argument", ->
-      expect(@toolbar.options).toEqual({appendTo: fixture.el, foo: true})
+      expect(@toolbar.options).toEqual({appendTo: '#test', foo: true})
 
     it "calls build", ->
       expect(@buildSpy.callCount).toEqual(1)
@@ -47,7 +48,7 @@ describe "Mercury.Toolbar", ->
       it "builds out toolbar elements from the configuration", ->
         expect($('.mercury-primary-toolbar').length).toEqual(1)
         expect($('.mercury-editable-toolbar').length).toEqual(1)
-        expect($('.mercury-editable-toolbar').data('regions')).toEqual('full,markdown')
+        expect($('.mercury-editable-toolbar').data('regions')).toEqual('editable,markupable')
 
       it "builds buttons etc.", ->
         expect(@buildButtonSpy.callCount).toBeGreaterThan(10)
@@ -81,7 +82,7 @@ describe "Mercury.Toolbar", ->
   describe "#buildButton", ->
 
     beforeEach ->
-      @toolbar = new Mercury.Toolbar({appendTo: fixture.el})
+      @toolbar = new Mercury.Toolbar({appendTo: '#test'})
 
     it "throws an exception when invalid options are passed", ->
       expect(=> @toolbar.buildButton('foo', false)).toThrow('Unknown button structure -- please provide an array, object, or string for "foo".')
@@ -126,24 +127,24 @@ describe "Mercury.Toolbar", ->
   describe "observed events", ->
 
     beforeEach ->
-      @toolbar = new Mercury.Toolbar({appendTo: fixture.el})
+      @toolbar = new Mercury.Toolbar({appendTo: '#test'})
 
     describe "custom event: region:focused", ->
 
       it "enables toolbars based on the region type", ->
         $('.mercury-editable-toolbar').addClass('disabled')
-        Mercury.trigger('region:focused', {region: {type: -> 'full'}})
+        Mercury.trigger('region:focused', {region: {type: 'editable'}})
         expect($('.mercury.editable-toolbar').hasClass('disabled')).toEqual(false)
 
         $('.mercury-editable-toolbar').addClass('disabled')
-        Mercury.trigger('region:focused', {region: {type: -> 'markdown'}})
+        Mercury.trigger('region:focused', {region: {type: 'markupable'}})
         expect($('.mercury.editable-toolbar').hasClass('disabled')).toEqual(false)
 
     describe "custom event: region:blurred", ->
 
       it "disables toolbars for the region type", ->
         $('.mercury-editable-toolbar').removeClass('disabled')
-        Mercury.trigger('region:blurred', {region: {type: -> 'full'}})
+        Mercury.trigger('region:blurred', {region: {type: 'editable'}})
         expect($('.mercury-editable-toolbar').hasClass('disabled')).toEqual(true)
 
     describe "click", ->
@@ -166,7 +167,7 @@ describe "Mercury.Toolbar", ->
     describe "when visible", ->
 
       beforeEach ->
-        @toolbar = new Mercury.Toolbar({appendTo: fixture.el, visible: true})
+        @toolbar = new Mercury.Toolbar({appendTo: '#test', visible: true})
 
       it "returns the element outerheight", ->
         expect(@toolbar.height()).toEqual($('.mercury-toolbar-container').outerHeight())
@@ -174,48 +175,18 @@ describe "Mercury.Toolbar", ->
     describe "when not visible", ->
 
       beforeEach ->
-        @toolbar = new Mercury.Toolbar({appendTo: fixture.el, visible: false})
+        @toolbar = new Mercury.Toolbar({appendTo: '#test', visible: false})
 
       it "returns 0", ->
         expect(@toolbar.height()).toEqual(0)
 
-    describe "when forced", ->
-
-      beforeEach ->
-        @toolbar = new Mercury.Toolbar({appendTo: fixture.el, visible: false})
-
-      it "returns the element outerheight", ->
-        expect(@toolbar.height(true)).toEqual($('.mercury-toolbar-container').outerHeight())
-
-  describe "#top", ->
-
-    beforeEach ->
-      spyOn(Mercury.Toolbar.prototype, 'buildButton').andCallFake(=> $('<div>'))
-      spyOn(Mercury.Toolbar.prototype, 'bindEvents').andCallFake(=>)
-
-    describe "when visible", ->
-
-      beforeEach ->
-        @toolbar = new Mercury.Toolbar({appendTo: fixture.el, visible: true})
-
-      it "returns the element offests top", ->
-        expect(@toolbar.top()).toEqual($('.mercury-toolbar-container').offset().top)
-
-    describe "when not visible", ->
-
-      beforeEach ->
-        @toolbar = new Mercury.Toolbar({appendTo: fixture.el, visible: false})
-
-      it "returns the element offests top", ->
-        expect(@toolbar.top()).toEqual(0)
-
 
   describe "#show", ->
 
     beforeEach ->
       spyOn(Mercury.Toolbar.prototype, 'buildButton').andCallFake(=> $('<div>'))
       spyOn(Mercury.Toolbar.prototype, 'bindEvents').andCallFake(=>)
-      @toolbar = new Mercury.Toolbar({appendTo: fixture.el, visible: false})
+      @toolbar = new Mercury.Toolbar({appendTo: '#test', visible: false})
 
     it "sets visible to true", ->
       @toolbar.visible = false
@@ -238,7 +209,7 @@ describe "Mercury.Toolbar", ->
     beforeEach ->
       spyOn(Mercury.Toolbar.prototype, 'buildButton').andCallFake(=> $('<div>'))
       spyOn(Mercury.Toolbar.prototype, 'bindEvents').andCallFake(=>)
-      @toolbar = new Mercury.Toolbar({appendTo: fixture.el, visible: true})
+      @toolbar = new Mercury.Toolbar({appendTo: '#test', visible: true})
 
     it "sets visible to false", ->
       @toolbar.visible = true

data/spec/javascripts/mercury/tooltip_spec.js.coffee

@@ -1,7 +1,8 @@
 describe "Mercury.tooltip", ->
 
+  template 'mercury/tooltip.html'
+
   beforeEach ->
-    fixture.load('mercury/tooltip.html')
     @forElement = $('#for_element')
     $.fx.off = true
 

data/spec/javascripts/mercury/uploader_spec.js.coffee

@@ -1,10 +1,9 @@
 describe "Mercury.uploader", ->
 
+  template 'mercury/uploader.html'
+
   beforeEach ->
-    fixture.load('mercury/uploader.html')
     Mercury.config.uploading.enabled = true
-    @fileReaderSupport = spyOn(Mercury.uploader, 'fileReaderSupported')
-    @fileReaderSupport.andCallFake(=> true)
     $.fx.off = true
     @mockFile = {
       size: 1024
@@ -121,7 +120,7 @@ describe "Mercury.uploader", ->
   describe "#build", ->
 
     beforeEach ->
-      Mercury.uploader.options = {appendTo: fixture.el}
+      Mercury.uploader.options = {appendTo: '#test'}
 
     it "builds an element structure", ->
       Mercury.uploader.build()
@@ -159,7 +158,7 @@ describe "Mercury.uploader", ->
   describe "#appear", ->
 
     beforeEach ->
-      Mercury.uploader.options = {appendTo: fixture.el}
+      Mercury.uploader.options = {appendTo: '#test'}
       Mercury.uploader.build()
       @fillDisplaySpy = spyOn(Mercury.uploader, 'fillDisplay').andCallFake(=>)
       @positionSpy = spyOn(Mercury.uploader, 'position').andCallFake(=>)
@@ -175,8 +174,8 @@ describe "Mercury.uploader", ->
 
     it "displays the overlay, and the element", ->
       Mercury.uploader.appear()
-      expect($('.mercury-uploader', fixture.el).css('display')).toEqual('block')
-      expect($('.mercury-uploader-overlay', fixture.el).css('display')).toEqual('block')
+      expect($('#test .mercury-uploader').css('display')).toEqual('block')
+      expect($('#test .mercury-uploader-overlay').css('display')).toEqual('block')
 
     it "sets visible to true", ->
       Mercury.uploader.appear()
@@ -190,7 +189,7 @@ describe "Mercury.uploader", ->
   describe "#position", ->
 
     beforeEach ->
-      Mercury.uploader.options = {appendTo: fixture.el}
+      Mercury.uploader.options = {appendTo: '#test'}
       Mercury.uploader.build()
       @fillDisplaySpy = spyOn(Mercury.uploader, 'fillDisplay').andCallFake(=>)
       @positionSpy = spyOn(Mercury.uploader, 'position').andCallFake(=>)
@@ -199,29 +198,28 @@ describe "Mercury.uploader", ->
       # todo: this isn't really being tested
       Mercury.uploader.element.css({display: 'block'})
       Mercury.uploader.position()
-      @expect($('.mercury-uploader', fixture.el).offset()).toEqual({top: 0, left: 0})
+      @expect($('#test .mercury-uploader').offset()).toEqual({top: 0, left: 0})
 
 
   describe "#fillDisplay", ->
 
     beforeEach ->
-      Mercury.uploader.options = {appendTo: fixture.el}
+      Mercury.uploader.options = {appendTo: '#test'}
       Mercury.uploader.file = {name: 'image.png', size: 1024, type: 'image/png'}
       Mercury.uploader.build()
 
     it "puts the file details into the element", ->
       Mercury.uploader.fillDisplay()
-      expect($('.mercury-uploader-details', fixture.el).html()).toEqual('Name: image.png<br>Size: undefined<br>Type: image/png')
+      expect($('#test .mercury-uploader-details').html()).toEqual('Name: image.png<br>Size: undefined<br>Type: image/png')
 
 
   describe "#loadImage", ->
 
     beforeEach ->
-      Mercury.uploader.options = {appendTo: fixture.el}
+      Mercury.uploader.options = {appendTo: '#test'}
       Mercury.uploader.file = new Mercury.uploader.File(@mockFile)
       Mercury.uploader.build()
       spyOn(FileReader.prototype, 'readAsBinaryString').andCallFake(=>)
-      @fileReaderSupport.andCallFake(=> true)
       @readAsDataURLSpy = spyOn(Mercury.uploader.File.prototype, 'readAsDataURL').andCallFake((callback) => callback('data-url'))
 
     it "calls file.readAsDataURL", ->
@@ -230,20 +228,7 @@ describe "Mercury.uploader", ->
 
     it "sets the preview image src to the file contents", ->
       Mercury.uploader.loadImage()
-      expect($('.mercury-uploader-preview img', fixture.el).attr('src')).toEqual('data-url')
-
-    it "calls upload", ->
-      spy = spyOn(Mercury.uploader, 'upload').andCallFake(=>)
-      Mercury.uploader.loadImage()
-      expect(spy.callCount).toEqual(1)
-
-  describe "#loadImage without FileReader", ->
-
-    beforeEach ->
-      Mercury.uploader.options = {appendTo: fixture.el}
-      Mercury.uploader.file = new Mercury.uploader.File(@mockFile)
-      Mercury.uploader.build()
-      @fileReaderSupport.andCallFake(=> false)
+      expect($('#test .mercury-uploader-preview img').attr('src')).toEqual('data-url')
 
     it "calls upload", ->
       spy = spyOn(Mercury.uploader, 'upload').andCallFake(=>)
@@ -253,60 +238,61 @@ describe "Mercury.uploader", ->
 
   describe "#upload", ->
 
-    it "should build a multipart form and submit it"
+    # todo: test this
+    it "should build a multipart form and submit it", ->
 
 
   describe "#updateStatus", ->
 
     beforeEach ->
-      Mercury.uploader.options = {appendTo: fixture.el}
+      Mercury.uploader.options = {appendTo: '#test'}
       Mercury.uploader.build()
 
     it "updated the message in the progress display", ->
       Mercury.uploader.updateStatus('status message')
-      expect($('.mercury-uploader-progress span', fixture.el).html()).toEqual('status message')
+      expect($('#test .mercury-uploader-progress span').html()).toEqual('status message')
 
     it "updates the progress indicator width", ->
       Mercury.uploader.updateStatus('message', 512)
-      expect($('.mercury-uploader-indicator div', fixture.el).css('width')).toEqual('50px')
+      expect($('#test .mercury-uploader-indicator div').css('width')).toEqual('50px')
 
     it "updates the progress indicator value", ->
       Mercury.uploader.updateStatus('message', 512)
-      expect($('.mercury-uploader-indicator b', fixture.el).html()).toEqual('50%')
+      expect($('#test .mercury-uploader-indicator b').html()).toEqual('50%')
 
 
   describe "#hide", ->
 
     beforeEach ->
       @setTimeoutSpy = spyOn(window, 'setTimeout')
-      Mercury.uploader.options = {appendTo: fixture.el}
+      Mercury.uploader.options = {appendTo: '#test'}
       Mercury.uploader.build()
 
     it "accepts a delay", ->
       @setTimeoutSpy.andCallFake(=>)
       Mercury.uploader.hide(1)
       expect(@setTimeoutSpy.callCount).toEqual(1)
-      expect(@setTimeoutSpy.argsForCall[0][1]).toEqual(1000)
+      expect(@setTimeoutSpy.argsForCall[0][0]).toEqual(1000)
 
     it "hides the overlay and element", ->
-      @setTimeoutSpy.andCallFake((callback, timeout) => callback())
+      @setTimeoutSpy.andCallFake((timeout, callback) => callback())
       Mercury.uploader.hide()
-      expect($('.mercury-uploader', fixture.el).css('opacity')).toEqual('0')
-      expect($('.mercury-uploader-overlay', fixture.el).css('opacity')).toEqual('0')
+      expect($('#test .mercury-uploader').css('opacity')).toEqual('0')
+      expect($('#test .mercury-uploader-overlay').css('opacity')).toEqual('0')
 
     it "calls reset", ->
-      @setTimeoutSpy.andCallFake((callback, timeout) => callback())
+      @setTimeoutSpy.andCallFake((timeout, callback) => callback())
       spy = spyOn(Mercury.uploader, 'reset').andCallFake(=>)
       Mercury.uploader.hide()
       expect(spy.callCount).toEqual(1)
 
     it "sets visible to false", ->
-      @setTimeoutSpy.andCallFake((callback, timeout) => callback())
+      @setTimeoutSpy.andCallFake((timeout, callback) => callback())
       Mercury.uploader.hide()
       expect(Mercury.uploader.visible).toEqual(false)
 
     it "focuses the frame", ->
-      @setTimeoutSpy.andCallFake((callback, timeout) => callback())
+      @setTimeoutSpy.andCallFake((timeout, callback) => callback())
       spy = spyOn(Mercury, 'trigger').andCallFake(=>)
       Mercury.uploader.hide()
       expect(spy.callCount).toEqual(1)
@@ -316,20 +302,20 @@ describe "Mercury.uploader", ->
   describe "#reset", ->
 
     beforeEach ->
-      Mercury.uploader.options = {appendTo: fixture.el}
+      Mercury.uploader.options = {appendTo: '#test'}
       Mercury.uploader.build()
 
     it "removes the preview image", ->
-      $('.mercury-uploader-indicator div', fixture.el).html('foo')
+      $('#test .mercury-uploader-indicator div').html('foo')
       Mercury.uploader.reset()
-      expect($('.mercury-uploader-preview b', fixture.el).html()).toEqual('')
+      expect($('#test .mercury-uploader-preview b').html()).toEqual('')
 
     it "resets the progress back to 0", ->
-      $('.mercury-uploader-indicator div', fixture.el).css({width: '50%'})
-      $('.mercury-uploader-indicator b', fixture.el).html('50%')
+      $('#test .mercury-uploader-indicator div').css({width: '50%'})
+      $('#test .mercury-uploader-indicator b').html('50%')
       Mercury.uploader.reset()
-      expect($('.mercury-uploader-indicator div', fixture.el).css('width')).toEqual('0px')
-      expect($('.mercury-uploader-indicator b', fixture.el).html()).toEqual('0%')
+      expect($('#test .mercury-uploader-indicator div').css('width')).toEqual('0px')
+      expect($('#test .mercury-uploader-indicator b').html()).toEqual('0%')
 
     it "sets the status back to 'Processing...' for next time", ->
       spy = spyOn(Mercury.uploader, 'updateStatus').andCallFake(=>)

data/spec/javascripts/{support/event_simulation.js → spec_helper.js}

@@ -1,3 +1,5 @@
+require('/assets/mercury.js');
+
 jasmine.simulate = {
 
   /**

data/spec/javascripts/templates/mercury/modals/insertlink.html

@@ -0,0 +1,30 @@
+<form>
+  <fieldset id="link_text_container">
+    <input id="link_text" name="link[text]" type="text"/>
+  </fieldset>
+
+  <label for="link_external_url"><input id="checkbox1" name="link_type" type="radio" value="external_url" checked="checked"/>URL</label>
+  <input class="selectable" id="link_external_url" name="link[external_url]" type="text"/>
+
+  <label for="link_existing_bookmark"><input id="checkbox2" name="link_type" type="radio" value="existing_bookmark"/>Existing Links</label>
+  <select class="selectable" id="link_existing_bookmark" name="link[existing_bookmark]"></select>
+
+  <label for="link_new_bookmark"><input name="link_type" type="radio" value="new_bookmark"/>Bookmark</label>
+  <input class="selectable" id="link_new_bookmark" name="link[new_bookmark]" type="text"/>
+
+  <select id="link_target" name="link[target]">
+    <option value="">Self (the same window or tab)</option>
+    <option value="_blank">Blank (a new window or tab)</option>
+    <option value="_top">Top (removes any frames)</option>
+    <option value="popup">Popup Window (javascript new window popup)</option>
+  </select>
+
+  <div class="link-target-options" id="popup_options" style="display:none">
+    <input id="link_popup_width" name="link[popup_width]" type="text"/>
+    <input id="link_popup_height" name="link[popup_height]" type="text"/>
+  </div>
+
+  <input id="submit" type="submit"/>
+</form>
+<a name="link1">Link One</a>
+<a name="link2">Link Two</a>

data/spec/javascripts/templates/mercury/modals/insertmedia.html

@@ -0,0 +1,35 @@
+<form>
+  <label for="media_image_url"><input id="checkbox1" name="media_type" type="radio" value="image_url" checked="checked"/>URL</label>
+  <input class="selectable" id="media_image_url" name="media[image_url]" type="text"/>
+
+  <label for="media_youtube_url"><input id="checkbox2" name="media_type" type="radio" value="youtube_url"/>YouTube Share URL</label>
+  <input class="selectable" id="media_youtube_url" name="media[youtube_url]" type="text"/>
+
+  <label for="media_vimeo_url"><input name="media_type" type="radio" value="vimeo_url"/>Vimeo URL</label>
+  <input class="selectable" id="media_vimeo_url" name="media[vimeo_url]" type="text"/>
+
+  <div class="media-options" id="image_url">
+    <select id="media_image_alignment" name="media[image_alignment]">
+      <option value="">None</option>
+      <option value="left">Left</option>
+      <option value="right">Right</option>
+      <option value="top">Top</option>
+      <option value="middle">Middle</option>
+      <option value="bottom">Bottom</option>
+      <option value="absmiddle">Absolute Middle</option>
+      <option value="absbottom">Absolute Bottom</option>
+    </select>
+  </div>
+
+  <div class="media-options" id="youtube_url" style="display:none">
+    <input id="media_youtube_width" name="media[youtube_width]" type="text" value="560"/>
+    <input id="media_youtube_height" name="media[youtube_height]" type="text" value="349"/>
+  </div>
+
+  <div class="media-options" id="vimeo_url" style="display:none">
+    <input id="media_vimeo_width" name="media[vimeo_width]" type="text" value="400"/>
+    <input id="media_vimeo_height" name="media[vimeo_height]" type="text" value="225"/>
+  </div>
+
+  <input id="submit" type="submit"/>
+</form>

data/spec/javascripts/templates/mercury/modals/inserttable.html

@@ -0,0 +1,27 @@
+<form>
+  <div id="table_display">
+    <table id="table" border="1" cellspacing="0"><tr><td id="cell1"></td></tr><tr><td id="cell2"></td></tr></table>
+  </div>
+
+  <input class="action" name="insertRowBefore" type="button" value="Add Before">
+  <input class="action" name="insertRowAfter" type="button" value="Add After">
+  <input class="action" name="deleteRow" type="button" value="Remove">
+  <input class="action" name="insertColumnBefore" type="button" value="Add Before">
+  <input class="action" name="insertColumnAfter" type="button" value="Add After">
+  <input class="action" name="deleteColumn" type="button" value="Remove">
+  <input class="action" name="increaseRowspan" type="button" value="+">
+  <input class="action" name="decreaseRowspan" type="button" value="-">
+  <input class="action" name="increaseColspan" type="button" value="+">
+  <input class="action" name="decreaseColspan" type="button" value="-">
+
+  <select id="table_alignment" name="table[alignment]">
+    <option value="">None</option>
+    <option value="left">Left</option>
+    <option value="right" id="right_option">Right</option>
+  </select>
+
+  <input id="table_border" type="text" value="1"/>
+  <input id="table_spacing" type="text" value="0"/>
+
+  <input id="submit" type="submit"/>
+</form>

data/spec/javascripts/{fixtures → templates}/mercury/page_editor.html

@@ -7,9 +7,9 @@
 <meta content="K6JhyfOVKJX8X2ZkiJXSf491fc1fF+k79wzrChHQa0g=" name="csrf-token" />
 
 <div id="page_editor_container"></div>
-<div id="region1" custom-region-attribute="full"></div>
-<div id="region2" custom-region-attribute="full"></div>
-<div id="region3" custom-region-attribute="full">
+<div id="region1" class="custom-region-class" data-type="editable"></div>
+<div id="region2" class="custom-region-class" data-type="editable"></div>
+<div id="region3" class="custom-region-class" data-type="editable">
   <a id="anchor1r" href="#" target="_top">1</a>
   <a id="anchor2r" href="#" target="_blank">2</a>
   <a id="anchor3r" href="#" target="_self">3</a>
@@ -19,7 +19,7 @@
   <form id="form3r" action="" target="_self"></form>
   <form id="form4r" action=""></form>
 </div>
-<div id="region4" custom-region-attribute=""></div>
+<div id="region4" class="custom-region-class"></div>
 
 <a id="anchor1" href="#" target="_top">1</a>
 <a id="anchor2" href="#" target="_blank">2</a>

data/spec/javascripts/templates/mercury/region.html

@@ -0,0 +1,2 @@
+<div id="region" data-scope="scope" data-version="1">contents</div>
+<div id="region_with_snippet">contents<div class="mercury-snippet" data-snippet="snippet_1" data-version="1">snippet</div></div>

data/spec/javascripts/templates/mercury/regions/editable.html

@@ -0,0 +1,3 @@
+<div id="editable_region1">
+
+</div>

data/spec/javascripts/templates/mercury/regions/snippetable.html

@@ -0,0 +1,4 @@
+<div id="snippetable_region1" data-type="snippetable"></div>
+<div id="snippetable_region2" data-type="snippetable">
+  <div class="mercury-snippet" data-snippet="snippet_1">12</div>
+</div>