kiteditor 1.0.11 → 1.0.12

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

@@ -1,8 +1,7 @@
 describe "Mercury.Palette", ->
 
-  template 'mercury/palette.html'
-
   beforeEach ->
+    fixture.load('mercury/palette.html')
     $.fx.off = true
 
   afterEach ->
@@ -12,7 +11,7 @@ describe "Mercury.Palette", ->
   describe "#build", ->
 
     it "builds an element", ->
-      @palette = new Mercury.Palette('/blank.html', 'foo', {appendTo: '#test', for: $('#button')})
+      @palette = new Mercury.Palette('/blank.html', 'foo', {appendTo: fixture.el, for: $('#button')})
       html = $('<div>').html(@palette.element).html()
       expect(html).toContain('class="mercury-palette mercury-foo-palette loading"')
       expect(html).toContain('style="display:none"')
@@ -25,7 +24,7 @@ describe "Mercury.Palette", ->
   describe "observed events", ->
 
     beforeEach ->
-      @palette = new Mercury.Palette('/blank.html', 'foo', {appendTo: '#test', for: $('#button')})
+      @palette = new Mercury.Palette('/blank.html', 'foo', {appendTo: fixture.el, for: $('#button')})
 
     it "hides", ->
       @palette.element.css({display: 'block'})
@@ -41,7 +40,7 @@ describe "Mercury.Palette", ->
   describe "#position", ->
 
     beforeEach ->
-      @palette = new Mercury.Palette('/blank.html', 'foo', {appendTo: '#test', for: $('#button')})
+      @palette = new Mercury.Palette('/blank.html', 'foo', {appendTo: fixture.el, for: $('#button')})
 
     it "positions based on it's button", ->
       @palette.element.css({display: 'block'})

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

@@ -1,8 +1,7 @@
 describe "Mercury.Panel", ->
 
-  template 'mercury/panel.html'
-
   beforeEach ->
+    fixture.load('mercury/panel.html')
     Mercury.displayRect = {top: 20, left: 20, width: 200, height: 200}
     $.fx.off = true
     Mercury.determinedLocale =
@@ -18,11 +17,11 @@ describe "Mercury.Panel", ->
   describe "#build", ->
 
     it "builds an element", ->
-      @panel = new Mercury.Panel('/evergreen/resources/panel.html', 'foo', {appendTo: '#test', title: 'foo panel'})
+      @panel = new Mercury.Panel('/evergreen/resources/panel.html', 'foo', {appendTo: fixture.el, title: 'foo panel'})
       html = $('<div>').html(@panel.element).html()
       expect(html).toContain('class="mercury-panel loading"')
       expect(html).toContain('style="display:none;"')
-      expect(html).toContain('<h1>foo panel</h1><div class="mercury-panel-pane"></div>')
+      expect(html).toContain('<h1><span>foo panel</span></h1><div class="mercury-panel-pane"></div>')
       expect(html).not.toContain('class="mercury-panel-close"')
 
     it "appends to any element", ->
@@ -30,7 +29,7 @@ describe "Mercury.Panel", ->
       expect($('#panel_container .mercury-panel').length).toEqual(1)
 
     it "creates a close button if it should", ->
-      @panel = new Mercury.Panel('/evergreen/resources/panel.html', 'foo', {appendTo: '#test', title: 'foo panel', closeButton: true})
+      @panel = new Mercury.Panel('/evergreen/resources/panel.html', 'foo', {appendTo: fixture.el, title: 'foo panel', closeButton: true})
       html = $('<div>').html(@panel.element).html()
       expect(html).toContain('class="mercury-panel-close"')
       expect(@panel.element.find('.mercury-panel-close').css('opacity')).toEqual('0')
@@ -39,7 +38,7 @@ describe "Mercury.Panel", ->
   describe "observed events", ->
 
     beforeEach ->
-      @panel = new Mercury.Panel('/evergreen/resources/panel.html', 'foo', {appendTo: '#test', title: 'foo panel', for: $('#button'), closeButton: true})
+      @panel = new Mercury.Panel('/evergreen/resources/panel.html', 'foo', {appendTo: fixture.el, title: 'foo panel', for: $('#button'), closeButton: true})
 
     describe "custom event: resize", ->
 
@@ -85,7 +84,7 @@ describe "Mercury.Panel", ->
   describe "#show", ->
 
     beforeEach ->
-      @panel = new Mercury.Panel('/evergreen/resources/panel.html', 'foo', {appendTo: '#test', title: 'foo panel'})
+      @panel = new Mercury.Panel('/evergreen/resources/panel.html', 'foo', {appendTo: fixture.el, title: 'foo panel'})
 
     it "hides other panels and dialogs", ->
       spyOn(Mercury.Panel.prototype, 'position')
@@ -146,7 +145,7 @@ describe "Mercury.Panel", ->
   describe "#loadContent", ->
 
     beforeEach ->
-      @panel = new Mercury.Panel('/evergreen/resources/panel.html', 'foo', {appendTo: '#test', title: 'foo panel'})
+      @panel = new Mercury.Panel('/evergreen/resources/panel.html', 'foo', {appendTo: fixture.el, title: 'foo panel'})
 
     it "sets loaded to be true", ->
       @panel.loadContent()
@@ -159,16 +158,14 @@ describe "Mercury.Panel", ->
     it "sets the element html to be the data passed to it", ->
       @panel.loadContent('<span>hello world!</span>')
       html = @panel.element.html()
-      expect(html).toContain('<h1>foo panel</h1>')
       expect(html).toContain('class="mercury-panel-pane"')
       expect(html).toContain('style="visibility: hidden;')
       expect(html).toContain('hello world!')
 
-    it "sets the element html to be the data passed to it", ->
+    it "sets the element html to be the data passed to it -- translated", ->
       Mercury.config.localization.enabled = true
       @panel.loadContent('<span>hello world!</span>')
       html = @panel.element.html()
-      expect(html).toContain('<h1>foo panel</h1>')
       expect(html).toContain('class="mercury-panel-pane"')
       expect(html).toContain('style="visibility: hidden;')
       expect(html).toContain('bork! bork!')
@@ -177,7 +174,7 @@ describe "Mercury.Panel", ->
   describe "#makesDraggable", ->
 
     beforeEach ->
-      @panel = new Mercury.Panel('/evergreen/resources/panel.html', 'foo', {appendTo: '#test', title: 'foo panel'})
+      @panel = new Mercury.Panel('/evergreen/resources/panel.html', 'foo', {appendTo: fixture.el, title: 'foo panel'})
 
     it "makes the element draggable", ->
       spy = spyOn($.fn, 'draggable').andCallFake(=>)

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

@@ -1,9 +1,8 @@
 describe "Mercury.Region", ->
 
-  template 'mercury/region.html'
-
   beforeEach ->
-    Mercury.config.regions.className = 'custom-region-class'
+    fixture.load('mercury/region.html')
+    Mercury.config.regions.attribute = 'custom-region-attribute'
     Mercury.config.regions.dataAttributes = []
 
   afterEach ->
@@ -127,17 +126,17 @@ describe "Mercury.Region", ->
 
       it "does nothing if in preview mode", ->
         @region.previewing = true
-        jasmine.simulate.mousemove($('#region_with_snippet .mercury-snippet').get(0))
+        jasmine.simulate.mousemove($('#region_with_snippet .example-snippet').get(0))
         expect(@triggerSpy.callCount).toEqual(0)
 
       it "does nothing if it's not the active region", ->
         Mercury.region = {}
-        jasmine.simulate.mousemove($('#region_with_snippet .mercury-snippet').get(0))
+        jasmine.simulate.mousemove($('#region_with_snippet .example-snippet').get(0))
         expect(@triggerSpy.callCount).toEqual(0)
 
       it "shows the snippet toolbar if a snippet was moused over", ->
         Mercury.region = @region
-        jasmine.simulate.mousemove($('#region_with_snippet .mercury-snippet').get(0))
+        jasmine.simulate.mousemove($('#region_with_snippet .example-snippet').get(0))
         expect(@triggerSpy.callCount).toEqual(1)
         expect(@triggerSpy.argsForCall[0][0]).toEqual('show:toolbar')
 
@@ -157,7 +156,7 @@ describe "Mercury.Region", ->
         expect(@triggerSpy.argsForCall[0]).toEqual(['hide:toolbar', {type: 'snippet', immediately: false}])
 
 
-  describe "#html", ->
+  describe "#content", ->
 
     beforeEach ->
       @region = new Mercury.Region($('#region_with_snippet'), window)
@@ -166,11 +165,15 @@ describe "Mercury.Region", ->
 
       it "returns the html of the element", ->
         content = @region.content()
-        expect(content).toEqual('contents<div class="mercury-snippet" data-snippet="snippet_1" data-version="1">snippet</div>')
+        expect(content).toEqual('contents<div class="example-snippet" data-snippet="snippet_1" data-version="1">snippet</div>')
 
       it "replaces snippet content with an indentifier if asked", ->
         content = @region.content(null, true)
-        expect(content).toEqual('contents<div class="mercury-snippet" data-snippet="snippet_1">[snippet_1]</div>')
+        expect(content).toEqual('contents<div class="example-snippet" data-snippet="snippet_1">[snippet_1]</div>')
+
+      it "does not execute JavaScript contained within the region (bug fix)", ->
+        (new Mercury.Region($('#region_with_javascript_snippet'), window)).content()
+        expect($('#modifiable-element').children().length).toEqual(0)
 
     describe "setting html", ->
 
@@ -195,9 +198,8 @@ describe "Mercury.Region", ->
       it "sets previewing to true", ->
         expect(@region.previewing).toEqual(true)
 
-      it "swaps classes on the element", ->
-        expect(@region.element.hasClass('custom-region-class')).toEqual(false)
-        expect(@region.element.hasClass('custom-region-class-preview')).toEqual(true)
+      it "removes the data attribute", ->
+        expect(@region.element.attr('custom-region-attribute')).toEqual(null)
 
       it "triggers a blur event", ->
         expect(@triggerSpy.callCount).toEqual(1)
@@ -212,9 +214,8 @@ describe "Mercury.Region", ->
       it "sets previewing to false", ->
         expect(@region.previewing).toEqual(false)
 
-      it "swaps classes on the element", ->
-        expect(@region.element.hasClass('custom-region-class-preview')).toEqual(false)
-        expect(@region.element.hasClass('custom-region-class')).toEqual(true)
+      it "adds the correct data attribute back", ->
+        expect(@region.element.attr('custom-region-attribute')).toEqual('unknown')
 
       it "calls focus if it's the active region", ->
         expect(@focusSpy.callCount).toEqual(1)
@@ -270,6 +271,10 @@ describe "Mercury.Region", ->
       @region.element.attr('data-version', 2)
       expect(@region.dataAttributes()).toEqual({scope: 'scope', version: '2'})
 
+    it "looks to @container if it's set", ->
+      @region.container = $('<div>').attr('data-version', 3)
+      expect(@region.dataAttributes()).toEqual({scope: undefined, version: '3'})
+
 
   describe "#serialize", ->
 
@@ -280,7 +285,7 @@ describe "Mercury.Region", ->
 
       it "returns an object with it's type, value, and snippets", ->
         serialized = @region.serialize()
-        expect(serialized.type).toEqual('region')
+        expect(serialized.type).toEqual('unknown')
         expect(serialized.value).toEqual('contents')
         expect(serialized.snippets).toEqual({})
         expect(serialized.data).toEqual({})
@@ -292,7 +297,7 @@ describe "Mercury.Region", ->
 
       it "returns an object with it's type, value, data and snippets", ->
         serialized = @region.serialize()
-        expect(serialized.type).toEqual('region')
+        expect(serialized.type).toEqual('unknown')
         expect(serialized.value).toEqual('contents')
         expect(serialized.snippets).toEqual({})
         expect(serialized.data).toEqual({scope: 'scope', version: '1'})

data/spec/javascripts/mercury/regions/{editable_spec.js.coffee → full_spec.js.coffee}

@@ -1,36 +1,35 @@
-describe "Mercury.Regions.Editable", ->
-
-  template 'mercury/regions/editable.html'
+describe "Mercury.Regions.Full", ->
 
   beforeEach ->
-    @regionElement = $('#editable_region1')
+    fixture.load('mercury/regions/full.html')
+    @regionElement = $('#full_region1')
 
   describe "constructor", ->
 
-     beforeEach ->
-       @buildSpy = spyOn(Mercury.Regions.Editable.prototype, 'build').andCallFake(=>)
-       @bindEventsSpy = spyOn(Mercury.Regions.Editable.prototype, 'bindEvents').andCallFake(=>)
+    beforeEach ->
+      @buildSpy = spyOn(Mercury.Regions.Full.prototype, 'build').andCallFake(=>)
+      @bindEventsSpy = spyOn(Mercury.Regions.Full.prototype, 'bindEvents').andCallFake(=>)
 
-     it "expects an element and window", ->
-       @region = new Mercury.Regions.Editable(@regionElement, window)
-       expect(@region.element.get(0)).toEqual($('#editable_region1').get(0))
-       expect(@region.window).toEqual(window)
+    it "expects an element and window", ->
+      @region = new Mercury.Regions.Full(@regionElement, window)
+      expect(@region.element.get(0)).toEqual($('#full_region1').get(0))
+      expect(@region.window).toEqual(window)
 
-     it "accepts options", ->
-       @region = new Mercury.Regions.Editable(@regionElement, window, {foo: 'something'})
-       expect(@region.options).toEqual({foo: 'something'})
+    it "accepts options", ->
+      @region = new Mercury.Regions.Full(@regionElement, window, {foo: 'something'})
+      expect(@region.options).toEqual({foo: 'something'})
 
-     it "sets it's type", ->
-       @region = new Mercury.Regions.Editable(@regionElement, window)
-       expect(@region.type).toEqual('editable')
+    it "sets it's type", ->
+      @region = new Mercury.Regions.Full(@regionElement, window)
+      expect(@region.type()).toEqual('full')
 
-     it "calls build", ->
-       @region = new Mercury.Regions.Editable(@regionElement, window)
-       expect(@buildSpy.callCount).toEqual(1)
+    it "calls build", ->
+      @region = new Mercury.Regions.Full(@regionElement, window)
+      expect(@buildSpy.callCount).toEqual(1)
 
-     it "calls bindEvents", ->
-       @region = new Mercury.Regions.Editable(@regionElement, window)
-       expect(@bindEventsSpy.callCount).toEqual(1)
+    it "calls bindEvents", ->
+      @region = new Mercury.Regions.Full(@regionElement, window)
+      expect(@bindEventsSpy.callCount).toEqual(1)
 
 
   describe "#build", ->
@@ -326,13 +325,12 @@ describe "Mercury.Regions.Editable", ->
 
 
 
-describe "Mercury.Regions.Editable.actions", ->
-
-  template 'mercury/regions/editable.html'
+describe "Mercury.Regions.Full.actions", ->
 
   beforeEach ->
-    #@region = new Mercury.Regions.Editable($('#editable_region1'), window)
-    #@actions = Mercury.Regions.Editable.actions
+    fixture.load('mercury/regions/full.html')
+    #@region = new Mercury.Regions.Full($('#full_region1'), window)
+    #@actions = Mercury.Regions.Full.actions
 
   #
   # behaviors

data/spec/javascripts/mercury/regions/image_spec.js.coffee

@@ -0,0 +1,33 @@
+describe "Mercury.Regions.Image", ->
+
+  beforeEach ->
+    fixture.load('mercury/regions/image.html')
+    @regionElement = $('#image_region1')
+
+  describe "constructor", ->
+
+    beforeEach ->
+      @buildSpy = spyOn(Mercury.Regions.Image.prototype, 'build').andCallFake(=>)
+      @bindEventsSpy = spyOn(Mercury.Regions.Image.prototype, 'bindEvents').andCallFake(=>)
+
+    it "expects an element and window", ->
+      @region = new Mercury.Regions.Image(@regionElement, window)
+      expect(@region.element.get(0)).toEqual($('#image_region1').get(0))
+      expect(@region.window).toEqual(window)
+
+    it "accepts options", ->
+      @region = new Mercury.Regions.Image(@regionElement, window, {foo: 'something'})
+      expect(@region.options).toEqual({foo: 'something'})
+
+    it "sets it's type", ->
+      @region = new Mercury.Regions.Image(@regionElement, window)
+      expect(@region.type()).toEqual('image')
+
+    it "calls build", ->
+      @region = new Mercury.Regions.Image(@regionElement, window)
+      expect(@buildSpy.callCount).toEqual(1)
+
+    it "calls bindEvents", ->
+      @region = new Mercury.Regions.Image(@regionElement, window)
+      expect(@bindEventsSpy.callCount).toEqual(1)
+

data/spec/javascripts/mercury/regions/{markupable_spec.js.coffee → markdown_spec.js.coffee}

@@ -1,43 +1,42 @@
-describe "Mercury.Regions.Markupable", ->
-
-  template 'mercury/regions/markupable.html'
+describe "Mercury.Regions.Markdown", ->
 
   beforeEach ->
-    @regionElement = $('#markupable_region1')
+    fixture.load('mercury/regions/markdown.html')
+    @regionElement = $('#markdown_region1')
 
   describe "constructor", ->
 
-     beforeEach ->
-       @buildSpy = spyOn(Mercury.Regions.Markupable.prototype, 'build').andCallFake(=>)
-       @bindEventsSpy = spyOn(Mercury.Regions.Markupable.prototype, 'bindEvents').andCallFake(=>)
-       spyOn(Mercury.Regions.Markupable.prototype, 'pushHistory').andCallFake(=>)
+    beforeEach ->
+      @buildSpy = spyOn(Mercury.Regions.Markdown.prototype, 'build').andCallFake(=>)
+      @bindEventsSpy = spyOn(Mercury.Regions.Markdown.prototype, 'bindEvents').andCallFake(=>)
+      spyOn(Mercury.Regions.Markdown.prototype, 'pushHistory').andCallFake(=>)
 
-     it "expects an element and window", ->
-       @region = new Mercury.Regions.Markupable(@regionElement, window)
-       expect(@region.element.get(0)).toEqual($('#markupable_region1').get(0))
-       expect(@region.window).toEqual(window)
+    it "expects an element and window", ->
+      @region = new Mercury.Regions.Markdown(@regionElement, window)
+      expect(@region.element.get(0)).toEqual($('#markdown_region1').get(0))
+      expect(@region.window).toEqual(window)
 
-     it "accepts options", ->
-       @region = new Mercury.Regions.Markupable(@regionElement, window, {foo: 'something'})
-       expect(@region.options).toEqual({foo: 'something'})
+    it "accepts options", ->
+      @region = new Mercury.Regions.Markdown(@regionElement, window, {foo: 'something'})
+      expect(@region.options).toEqual({foo: 'something'})
 
-     it "sets it's type", ->
-       @region = new Mercury.Regions.Markupable(@regionElement, window)
-       expect(@region.type).toEqual('markupable')
+    it "sets it's type", ->
+      @region = new Mercury.Regions.Markdown(@regionElement, window)
+      expect(@region.type()).toEqual('markdown')
 
-     it "creates a markdown converter using Showdown", ->
-       spy = spyOn(Showdown, 'converter').andCallFake(=>)
-       @region = new Mercury.Regions.Markupable(@regionElement, window)
-       expect(spy.callCount).toEqual(1)
-       expect(@region.converter).toBeDefined()
+    it "creates a markdown converter using Showdown", ->
+      spy = spyOn(Showdown, 'converter').andCallFake(=>)
+      @region = new Mercury.Regions.Markdown(@regionElement, window)
+      expect(spy.callCount).toEqual(1)
+      expect(@region.converter).toBeDefined()
 
-     it "calls build", ->
-       @region = new Mercury.Regions.Markupable(@regionElement, window)
-       expect(@buildSpy.callCount).toEqual(1)
+    it "calls build", ->
+      @region = new Mercury.Regions.Markdown(@regionElement, window)
+      expect(@buildSpy.callCount).toEqual(1)
 
-     it "calls bindEvents", ->
-       @region = new Mercury.Regions.Markupable(@regionElement, window)
-       expect(@bindEventsSpy.callCount).toEqual(1)
+    it "calls bindEvents", ->
+      @region = new Mercury.Regions.Markdown(@regionElement, window)
+      expect(@bindEventsSpy.callCount).toEqual(1)
 
 
   describe "#build", ->
@@ -266,13 +265,12 @@ describe "Mercury.Regions.Markupable", ->
 
 
 
-describe "Mercury.Regions.Markupable.actions", ->
-
-  template 'mercury/regions/markupable.html'
+describe "Mercury.Regions.Markdown.actions", ->
 
   beforeEach ->
-    #@region = new Mercury.Regions.Markupable($('#markupable_region1'), window)
-    #@actions = Mercury.Regions.Markupable.actions
+    fixture.load('mercury/regions/markdown.html')
+    #@region = new Mercury.Regions.Markdown($('#markdown_region1'), window)
+    #@actions = Mercury.Regions.Markdown.actions
 
   describe ".undo", ->
 

data/spec/javascripts/mercury/regions/simple_spec.js.coffee

@@ -0,0 +1,32 @@
+describe "Mercury.Regions.Simple", ->
+
+  beforeEach ->
+    fixture.load('mercury/regions/simple.html')
+    @regionElement = $('#simple_region1')
+
+  describe "constructor", ->
+
+    beforeEach ->
+      @buildSpy = spyOn(Mercury.Regions.Simple.prototype, 'build').andCallFake(=>)
+      @bindEventsSpy = spyOn(Mercury.Regions.Simple.prototype, 'bindEvents').andCallFake(=>)
+
+    it "expects an element and window", ->
+      @region = new Mercury.Regions.Simple(@regionElement, window)
+      expect(@region.element.get(0)).toEqual($('#simple_region1').get(0))
+      expect(@region.window).toEqual(window)
+
+    it "accepts options", ->
+      @region = new Mercury.Regions.Simple(@regionElement, window, {foo: 'something'})
+      expect(@region.options).toEqual({foo: 'something'})
+
+    it "sets it's type", ->
+      @region = new Mercury.Regions.Simple(@regionElement, window)
+      expect(@region.type()).toEqual('simple')
+
+    it "calls build", ->
+      @region = new Mercury.Regions.Simple(@regionElement, window)
+      expect(@buildSpy.callCount).toEqual(1)
+
+    it "calls bindEvents", ->
+      @region = new Mercury.Regions.Simple(@regionElement, window)
+      expect(@bindEventsSpy.callCount).toEqual(1)