kiteditor 1.0.12 → 1.0.13

data/{app → vendor}/assets/javascripts/mercury/locales/pt.locale.js.coffee

@@ -74,8 +74,6 @@ Mercury.I18n['pt'] =
   "Mercury.PageEditor failed to load: %s\n\nPlease try refreshing.": "Mercury.PageEditor não pôde carregar: %s\n\nPor favor, recarregue a página."
   "Region type is malformed, no data-type provided, or \"%s\" is unknown for the \"%s\" region.": "A região não digitada corretamente, não foi definido um 'data-type', ou \"%s\" é desconhecido na região de \"%s\"."
   "Mercury was unable to save to the url: %s": ""
-  "invalid": "inválido"
-  "can't be blank": "não pode estar em branco"
   # Confirmations
   "You have unsaved changes.  Are you sure you want to leave without saving them first?": "Você modificou esta página.  Quer sair sem salvar seu trabalho?"
 
@@ -112,6 +110,10 @@ Mercury.I18n['pt'] =
   "Size: %s": "Tamanho: \"%s\"."
   "Type: %s": "Tipo: \"%s\"."
 
+  # Inserting Media
+  "Error: The provided youtube share url was invalid.": "Erro: Link inválido no youtube."
+  "Error: The provided vimeo url was invalid.": "Erro: Link inválido no vimeo."
+
   # Statusbar
   "Path:": "Caminho"
 
@@ -134,11 +136,12 @@ Mercury.I18n['pt'] =
   "Popup Window (javascript new window popup)": "Popup Window (Janela feia em javascript)"
   "Popup Width": "Largura do popup"
   "Popup Height": "Altura do popup"
+  "Insert Link": "Inserir Link"
 
   # Insert Media Modal (media.html)
   "Images": "Imagens"
   "Videos": "Vídeos"
-  "YouTube URL": "Link do Youtube"
+  "YouTube Share URL": "Link do Youtube"
   "Vimeo URL": "Link do Vimeo"
   "Alignment": "Alinhamento"
   "None": "Nenhum"
@@ -161,8 +164,11 @@ Mercury.I18n['pt'] =
   "Columns": "Colunas"
   "Row Span": "Células horizontais"
   "Column Span": "Células verticais"
+  "Options": "Opções"
+  "Alignment": "Alinhamento"
   "Border": "Borda"
   "Spacing": "Espaçamento"
+  "Insert Table": "Inserir Tabela"
 
   # HTML Editor Modal (htmleditor.html)
   "HTML Editor": "Editor HTML"

data/{app → vendor}/assets/javascripts/mercury/locales/sv.local.js.coffee

@@ -74,8 +74,6 @@ Mercury.I18n['sv'] =
   "Mercury.PageEditor failed to load: %s\n\nPlease try refreshing.": "Mercury.PageEditor misslyckades att ladda: %s\n\nVänligen försök att ladda om sidan."
   "Region type is malformed, no data-type provided, or \"%s\" is unknown for the \"%s\" region.": "Regionstyp är felaktigt formaterad, ingen datatyp angavs, eller \"%s\" är okänt för \"%s\" regionen."
   "Mercury was unable to save to the url: %s": "Mercury kunde inte spara till adressen: %s"
-  "invalid": "ogiltig"
-  "can't be blank": "kan inte vara tomt"
   # Confirmations
   "You have unsaved changes.  Are you sure you want to leave without saving them first?": "Du har osparade ändringar. Är du säker på att du vill lämna sidan utan att spara dem först?"
 
@@ -112,6 +110,10 @@ Mercury.I18n['sv'] =
   "Size: %s": "Storlek: %s"
   "Type: %s": "Typ: %s"
 
+  # Inserting Media
+  "Error: The provided youtube share url was invalid.": "Fel: Den angivna delningsadressen för Youtube är felaktig."
+  "Error: The provided vimeo url was invalid.": "Fel: Den angivna Vimeo-adressen är felaktig."
+
   # Statusbar
   "Path:": "Sökväg:"
 
@@ -134,11 +136,12 @@ Mercury.I18n['sv'] =
   "Popup Window (javascript new window popup)": "Popupfönster (javascript nytt fönster)"
   "Popup Width": "Bredd för popup"
   "Popup Height": "Höjd för popup"
+  "Insert Link": "Infoga länk"
 
   # Insert Media Modal (media.html)
   "Images": "Bilder"
   "Videos": "Video"
-  "YouTube URL": "YouTube-URL"
+  "YouTube Share URL": "YouTube delnings-URL"
   "Vimeo URL": "Vimeo-URL"
   "Alignment": "Justering"
   "None": "Ingen"
@@ -161,8 +164,11 @@ Mercury.I18n['sv'] =
   "Columns": "Kolumner"
   "Row Span": "Rad-vidd"
   "Column Span": "Kolumn-vidd"
+  "Options": "Inställningar"
+  "Alignment": "Justering"
   "Border": "Ram"
   "Spacing": "Mellanrum"
+  "Insert Table": "Infoga tabell"
 
   # HTML Editor Modal (htmleditor.html)
   "HTML Editor": "HTML-redigerare"

data/{app → vendor}/assets/javascripts/mercury/locales/swedish_chef.locale.js.coffee

@@ -74,8 +74,6 @@ Mercury.I18n['swedish_chef'] =
   "Mercury.PageEditor failed to load: %s\n\nPlease try refreshing.": "Mercury.PegeEdeetur feeeled tu lued: %s\n\nPleese-a try reffresheeng."
   "Region type is malformed, no data-type provided, or \"%s\" is unknown for the \"%s\" region.": "Regeeun type-a is melffurmed, nu deta-type-a prufeeded, oor \"%s\" is unknoon fur zee \"%s\" regeeun."
   "Mercury was unable to save to the url: %s": "Mercury ves uneble-a tu sefe-a tu zee url: %s"
-  "invalid": "infeleed"
-  "can't be blank": "cun't be-a blunk"
   # Confirmations
   "You have unsaved changes.  Are you sure you want to leave without saving them first?": "Yuoo hefe-a unsefed chunges.  Ere-a yuoo soore-a yuoo vunt tu leefe-a veethuoot sefeeng zeem furst?"
 
@@ -112,6 +110,10 @@ Mercury.I18n['swedish_chef'] =
   "Size: %s": "Seeze-a: %s"
   "Type: %s": "Type-a: %s"
 
+  # Inserting Media
+  "Error: The provided youtube share url was invalid.": "Irrur: Zee prufeeded youtube shere-a url ves infeleed."
+  "Error: The provided vimeo url was invalid.": "Irrur: Zee prufeeded vimeo url ves infeleed."
+
   # Statusbar
   "Path:": "Pet:"
 
@@ -134,11 +136,12 @@ Mercury.I18n['swedish_chef'] =
   "Popup Window (javascript new window popup)": "Pupoop Veendoo (jefescreept noo veendoo pupoop)"
   "Popup Width": "Pupoop Veedt"
   "Popup Height": "Pupoop Heeeght"
+  "Insert Link": "Insert Leenk"
 
   # Insert Media Modal (media.html)
   "Images": "Imeges"
   "Videos": "Feedeus"
-  "YouTube URL": "YouTube URL"
+  "YouTube Share URL": "YouTube Shere-a URL"
   "Vimeo URL": "Vimeo URL"
   "Alignment": "Eleegnment"
   "None": "Nune-a"
@@ -161,8 +164,11 @@ Mercury.I18n['swedish_chef'] =
   "Columns": "Culoomns"
   "Row Span": "Roo Spun"
   "Column Span": "Culoomn Spun"
+  "Options": "Oopshuns"
+  "Alignment": "Eleegnment"
   "Border": "Burder"
   "Spacing": "Speceeng"
+  "Insert Table": "Insert Teble-a"
 
   # HTML Editor Modal (htmleditor.html)
   "HTML Editor": "HTML Ideetur"

data/{app → vendor}/assets/javascripts/mercury/mercury.js.coffee

@@ -34,7 +34,7 @@
 #
 @Mercury ||= {}
 jQuery.extend @Mercury,
-  version: '0.9.0'
+  version: '0.3.0'
 
   # Mercury object namespaces
   Regions: Mercury.Regions || {}
@@ -55,14 +55,6 @@ jQuery.extend @Mercury,
     jQuery(window).on("mercury:#{eventName}", callback)
 
 
-  off: (eventName, callback) ->
-    jQuery(window).off("mercury:#{eventName}", callback)
-
-
-  one: (eventName, callback) ->
-    jQuery(window).one("mercury:#{eventName}", callback)
-
-
   trigger: (eventName, options) ->
     Mercury.log(eventName, options)
     jQuery(window).trigger("mercury:#{eventName}", options)
@@ -100,7 +92,6 @@ jQuery.extend @Mercury,
   locale: ->
     return Mercury.determinedLocale if Mercury.determinedLocale
     if Mercury.config.localization.enabled
-      debugger
       locale = []
       if navigator.language && (locale = navigator.language.toString().split('-')).length
         topLocale = Mercury.I18n[locale[0]] || {}

data/{app → vendor}/assets/javascripts/mercury/modal.js.coffee

@@ -1,27 +1,19 @@
 @Mercury.modal = (url, options = {}) ->
-  instance = new Mercury.Modal(url, options)
-  instance.show()
-  return instance
+  Mercury.modal.show(url, options)
+  return Mercury.modal
 
-class @Mercury.Modal
-
-  constructor: (@url, @options = {}) ->
-
-
-  show: (url = null, options = null) ->
-    @url = url || @url
-    @options = options || @options
-    @options.minWidth ||= 400
-    @options.ujsHandling = true unless @options.ujsHandling == false
+jQuery.extend Mercury.modal,
+  minWidth: 500
 
+  show: (@url, @options = {}) ->
     Mercury.trigger('focus:window')
-    @initializeModal()
+    @initialize()
     if @visible then @update() else @appear()
     if @options.content
-      setTimeout((=> @loadContent(@options.content)), 500)
+      setTimeout 500, => @loadContent(@options.content)
 
 
-  initializeModal: ->
+  initialize: ->
     return if @initialized
     @build()
     @bindEvents()
@@ -29,23 +21,20 @@ class @Mercury.Modal
 
 
   build: ->
-    @element = jQuery('.mercury-modal')
-    @overlay = jQuery('.mercury-modal-overlay')
-    
-    unless @element.get(0) && @overlay.get(0)
-      @element = jQuery('<div>', {class: 'mercury-modal loading'})
-      @element.html('<h1 class="mercury-modal-title"><span></span><a>&times;</a></h1>')
-      @element.append('<div class="mercury-modal-content-container"><div class="mercury-modal-content"></div></div>')
-      
-      @overlay = jQuery('<div>', {class: 'mercury-modal-overlay'})
-      
-      @element.appendTo(jQuery(@options.appendTo).get(0) ? 'body')
-      @overlay.appendTo(jQuery(@options.appendTo).get(0) ? 'body')
-    
+    @element = jQuery('<div>', {class: 'mercury-modal loading'})
+    @element.html('<h1 class="mercury-modal-title"><span></span><a>&times;</a></h1>')
+    @element.append('<div class="mercury-modal-content-container"><div class="mercury-modal-content"></div></div>')
+
+    @overlay = jQuery('<div>', {class: 'mercury-modal-overlay'})
+
     @titleElement = @element.find('.mercury-modal-title')
     @contentContainerElement = @element.find('.mercury-modal-content-container')
+    
     @contentElement = @element.find('.mercury-modal-content')
 
+    @element.appendTo(jQuery(@options.appendTo).get(0) ? 'body')
+    @overlay.appendTo(jQuery(@options.appendTo).get(0) ? 'body')
+
 
   bindEvents: ->
     Mercury.on 'refresh', => @resize(true)
@@ -57,13 +46,12 @@ class @Mercury.Modal
     @titleElement.find('a').on 'click', =>
       @hide()
 
-    if @options.ujsHandling
-      @element.on 'ajax:beforeSend', (event, xhr, options) =>
-        options.success = (content) =>
-          @loadContent(content)
+    @element.on 'ajax:beforeSend', (event, xhr, options) =>
+      options.success = (content) =>
+        @loadContent(content)
 
     jQuery(document).on 'keydown', (event) =>
-      @hide() if event.keyCode == 27 && @visible
+       @hide() if event.keyCode == 27 && @visible
 
 
   appear: ->
@@ -97,16 +85,18 @@ class @Mercury.Modal
 
     height = @contentElement.outerHeight() + titleHeight
 
-    width = @options.minWidth if width < @options.minWidth
-    height = Mercury.displayRect.fullHeight -20 if height > Mercury.displayRect.fullHeight - 20 || @options.fullHeight
+    width = @minWidth if width < @minWidth
+    height = Mercury.displayRect.fullHeight - 20 if height > Mercury.displayRect.fullHeight - 20 || @options.fullHeight
+    if @fix_height
+      height = @fix_height
 
     @element.stop().animate {left: (Mercury.displayRect.width - width) / 2, width: width, height: height}, 200, 'easeInOutSine', =>
       @contentElement.css({visibility: 'visible', display: 'block'})
       if @contentPane.length
         @contentElement.css({height: height - titleHeight, overflow: 'visible'})
-        controlHeight = if @contentControl.length then @contentControl.outerHeight() + 10 else 0
-        @contentPane.css({height: height - titleHeight - controlHeight - 20})
-        @contentPane.find('.mercury-display-pane').css({width: width - 20})
+        controlHeight = if @contentControl.length then @contentControl.outerHeight() else 0
+        @contentPane.css({height: height - titleHeight - controlHeight - 40})
+        @contentPane.find('.mercury-display-pane').css({width: width - 40})
       else
         @contentElement.css({height: height - titleHeight, overflow: 'auto'})
 
@@ -121,15 +111,15 @@ class @Mercury.Modal
     width = @element.width()
     height = @element.height()
 
-    width = @options.minWidth if width < @options.minWidth
-    height = Mercury.displayRect.fullHeight if height > Mercury.displayRect.fullHeight || @options.fullHeight
+    width = @minWidth if width < @minWidth
+    height = Mercury.displayRect.fullHeight - 20 if height > Mercury.displayRect.fullHeight - 20 || @options.fullHeight
 
     titleHeight = @titleElement.outerHeight()
     if @contentPane && @contentPane.length
       @contentElement.css({height: height - titleHeight, overflow: 'visible'})
-      controlHeight = if @contentControl.length then @contentControl.outerHeight() + 10 else 0
-      @contentPane.css({height: height - titleHeight - controlHeight - 20})
-      @contentPane.find('.mercury-display-pane').css({width: width - 20})
+      controlHeight = if @contentControl.length then @contentControl.outerHeight() else 0
+      @contentPane.css({height: height - titleHeight - controlHeight - 40})
+      @contentPane.find('.mercury-display-pane').css({width: width - 40})
     else
       @contentElement.css({height: height - titleHeight, overflow: 'auto'})
 
@@ -153,7 +143,7 @@ class @Mercury.Modal
     return unless @url
     @element.addClass('loading')
     if Mercury.preloadedViews[@url]
-      setTimeout((=> @loadContent(Mercury.preloadedViews[@url])), 10)
+      setTimeout(10, => @loadContent(Mercury.preloadedViews[@url]))
     else
       jQuery.ajax @url, {
         headers: Mercury.ajaxHeaders()
@@ -167,7 +157,7 @@ class @Mercury.Modal
 
 
   loadContent: (data, options = null) ->
-    @initializeModal()
+    @initialize()
     @options = options || @options
     @setTitle()
     @loaded = true
@@ -182,20 +172,11 @@ class @Mercury.Modal
     @options.afterLoad.call(@) if @options.afterLoad
     if @options.handler
       if Mercury.modalHandlers[@options.handler]
-        if typeof(Mercury.modalHandlers[@options.handler]) == 'function'
-          Mercury.modalHandlers[@options.handler].call(@)
-        else
-          jQuery.extend(@, Mercury.modalHandlers[@options.handler])
-          @initialize()
+        Mercury.modalHandlers[@options.handler].call(@)
       else if Mercury.lightviewHandlers[@options.handler]
-        if typeof(Mercury.lightviewHandlers[@options.handler]) == 'function'
-          Mercury.lightviewHandlers[@options.handler].call(@)
-        else
-          jQuery.extend(@, Mercury.lightviewHandlers[@options.handler])
-          @initialize()
+        Mercury.lightviewHandlers[@options.handler].call(@)
 
     @element.localize(Mercury.locale()) if Mercury.config.localization.enabled
-    @element.find('.modal-close').on('click', @hide)
     @resize()
 
 
@@ -205,18 +186,15 @@ class @Mercury.Modal
     if @options.closeButton == false then closeButton.hide() else closeButton.show()
 
 
-  serializeForm: ->
-    return @element.find('form').serializeObject() || {}
-
-
   reset: ->
     @titleElement.find('span').html('')
     @contentElement.html('')
 
 
-  hide: =>
+  hide: ->
     return if @showing
     @options = {}
+    @initialized = false
 
     Mercury.trigger('focus:frame')
     @element.hide()

data/{app → vendor}/assets/javascripts/mercury/modals/htmleditor.js.coffee

@@ -1,12 +1,11 @@
 @Mercury.modalHandlers.htmlEditor = ->
-
   # fill the text area with the content
   content = Mercury.region.content(null, true, false)
-  @element.find('textarea').val(content)
+  parent.frames[0].will_be_content = content
 
   # replace the contents on form submit
   @element.find('form').on 'submit', (event) =>
     event.preventDefault()
-    value = @element.find('textarea').val()
+    value = parent.frames[0].html_editor.getValue()
     Mercury.trigger('action', {action: 'replaceHTML', value: value})
     @hide()

data/{app → vendor}/assets/javascripts/mercury/modals/insertcharacter.js.coffee

@@ -1,5 +1,4 @@
 @Mercury.modalHandlers.insertCharacter = ->
-
   @element.find('.character').on 'click', (event) =>
     Mercury.trigger('action', {action: 'insertHTML', value: "&#{jQuery(event.target).attr('data-entity')};"})
     @hide()

data/{app → vendor}/assets/javascripts/mercury/modals/insertsnippet.js.coffee

@@ -1,5 +1,4 @@
 @Mercury.modalHandlers.insertSnippet = ->
-
   @element.find('form').on 'submit', (event) =>
     event.preventDefault()
     serializedForm = @element.find('form').serializeObject()
@@ -11,4 +10,3 @@
       snippet = Mercury.Snippet.create(@options.snippetName, serializedForm)
     Mercury.trigger('action', {action: 'insertSnippet', value: snippet})
     @hide()
-

data/vendor/assets/javascripts/mercury/modals/inserttable.js.coffee

@@ -0,0 +1,54 @@
+@Mercury.modalHandlers.insertTable = ->
+  table = @element.find('#table_display table')
+
+  # make td's selectable
+  table.on 'click', (event) =>
+    cell = jQuery(event.target)
+    table = cell.closest('table')
+    table.find('.selected').removeAttr('class')
+    cell.addClass('selected')
+    Mercury.tableEditor(table, cell, ' ')
+
+  # select the first td
+  firstCell = table.find('td, th').first()
+  firstCell.addClass('selected')
+  Mercury.tableEditor(table, firstCell, ' ')
+
+  # make the buttons work
+  @element.find('input.action').on 'click', (event) =>
+    action = jQuery(event.target).attr('name')
+    switch action
+      when 'insertRowBefore' then Mercury.tableEditor.addRow('before')
+      when 'insertRowAfter' then Mercury.tableEditor.addRow('after')
+      when 'deleteRow' then Mercury.tableEditor.removeRow()
+      when 'insertColumnBefore' then Mercury.tableEditor.addColumn('before')
+      when 'insertColumnAfter' then Mercury.tableEditor.addColumn('after')
+      when 'deleteColumn' then Mercury.tableEditor.removeColumn()
+      when 'increaseColspan' then Mercury.tableEditor.increaseColspan()
+      when 'decreaseColspan' then Mercury.tableEditor.decreaseColspan()
+      when 'increaseRowspan' then Mercury.tableEditor.increaseRowspan()
+      when 'decreaseRowspan' then Mercury.tableEditor.decreaseRowspan()
+
+  # set the alignment
+  @element.find('#table_alignment').on 'change', =>
+    table.attr({align: @element.find('#table_alignment').val()})
+
+  # set the border
+  @element.find('#table_border').on 'keyup', =>
+    table.attr({border: parseInt(@element.find('#table_border').val())})
+
+  # set the cellspacing
+  @element.find('#table_spacing').on 'keyup', =>
+    table.attr({cellspacing: parseInt(@element.find('#table_spacing').val())})
+
+  # build the table on form submission
+  @element.find('form').on 'submit', (event) =>
+    event.preventDefault()
+    table.find('.selected').removeAttr('class')
+    table.find('td, th').html('<br/>')
+
+    html = jQuery('<div>').html(table).html()
+    value = html.replace(/^\s+|\n/gm, '').replace(/(<\/.*?>|<table.*?>|<tbody>|<tr>)/g, '$1\n')
+
+    Mercury.trigger('action', {action: 'insertTable', value: value})
+    @hide()

data/{app → vendor}/assets/javascripts/mercury/native_extensions.js.coffee

@@ -47,3 +47,9 @@ Number::toBytes = ->
     bytes /= 1024
     i += 1
   return if i then "#{bytes.toFixed(2)}#{['', ' kb', ' Mb', ' Gb', ' Tb', ' Pb', ' Eb'][i]}" else "#{bytes} bytes"
+
+
+# make setTimeout not suck for coffeescript
+window.originalSetTimeout = window.setTimeout
+window.setTimeout = (arg1, arg2) ->
+  if typeof(arg1) == 'number' then window.originalSetTimeout(arg2, arg1) else window.originalSetTimeout(arg1, arg2)