kiteditor 1.0.20 → 1.0.21

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 995aa0e2b76b945a1c27e41d7b189747037a9f72
+  data.tar.gz: 70c6ef89f2b7333eaec520e483079d6db77556b9
+SHA512:
+  metadata.gz: 42e572d3dea18ec822252ec4b1906f13d08296b15265a8ca9e8d207d83c0a328d6c2f29e63790377123c5623883c8a980d506bb8d8b31c8c20bd044f99aba41a
+  data.tar.gz: 5af6c84db53e8db596fc2b21a147dc7af7e115a203c113c134f734ffb6ce160eef44435dbc7a8233cdc21b5d8a731902a5cb62f3df297d81356241b7cbee18f7

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

@@ -1,12 +1,13 @@
 @Mercury.modalHandlers.insertSnippet = ->
-  @element.find('form').on 'submit', (event) =>
-    event.preventDefault()
-    serializedForm = @element.find('form').serializeObject()
-    if Mercury.snippet
-      snippet = Mercury.snippet
-      snippet.setOptions(serializedForm)
-      Mercury.snippet = null
-    else
-      snippet = Mercury.Snippet.create(@options.snippetName, serializedForm)
-    Mercury.trigger('action', {action: 'insertSnippet', value: snippet})
-    @hide()
+  #@element.find('form').on 'submit', (event) =>
+    #event.preventDefault()
+    #serializedForm = @element.find('form').serializeObject()
+    #if Mercury.snippet
+      #snippet = Mercury.snippet
+      #snippet.setOptions(serializedForm)
+      #Mercury.snippet = null
+    #else
+      #snippet = Mercury.Snippet.create(@options.snippetName, serializedForm)
+    #Mercury.trigger('action', {action: 'insertSnippet', value: snippet})
+    # TODO: Insert block
+    #@hide()

data/vendor/assets/javascripts/mercury/page_editor.js.coffee

@@ -114,6 +114,7 @@ class @Mercury.PageEditor
       action.call(@, options)
 
     @document.on 'mousedown', (event) ->
+      console.log("HERE")
       Mercury.trigger('hide:dialogs')
       if Mercury.region
         Mercury.trigger('unfocus:regions') unless jQuery(event.target).closest(".#{Mercury.config.regions.className}").get(0) == Mercury.region.element.get(0)
@@ -215,6 +216,10 @@ class @Mercury.PageEditor
 
   save: (callback) ->
     url = @saveUrl ? Mercury.saveURL ? @iframeSrc()
+
+    # TODO
+    set_block_options(true, false)
+
     data = @serialize()
     Mercury.log('saving', data)
     data = jQuery.toJSON(data) unless @options.saveStyle == 'form'

data/vendor/assets/javascripts/mercury/region.js.coffee

@@ -30,6 +30,7 @@ class @Mercury.Region
     Mercury.on 'action', (event, options) =>
       return if @previewing || Mercury.region != @
       @execCommand(options.action, options) if options.action
+      
 
     @element.on 'mousemove', (event) =>
       return if @previewing || Mercury.region != @
@@ -86,7 +87,11 @@ class @Mercury.Region
   snippets: ->
     snippets = {}
     for element in @element.find('[data-snippet]')
+      console.log(element);
+
       snippet = Mercury.Snippet.find(jQuery(element).data('snippet'))
+      console.log(snippet);
+      
       snippet.setVersion(jQuery(element).data('version'))
       snippets[snippet.identity] = snippet.serialize()
     return snippets

data/vendor/assets/javascripts/mercury/regions/editable.js.coffee

@@ -95,8 +95,11 @@ class @Mercury.Regions.Editable extends Mercury.Region
       return if @previewing
       if snippet = @element.find('img[data-snippet]').get(0)
         @focus()
-        Mercury.Snippet.displayOptionsFor(jQuery(snippet).data('snippet'))
-        @document.execCommand('undo', false, null)
+
+        # TODO: block_options
+        options = block_options_window(jQuery(snippet).data('snippet'), null)
+
+        #@document.execCommand('undo', false, null)
 
     # custom paste handling: we have to do some hackery to get the pasted content since it's not exposed normally
     # through a clipboard in firefox (heaven forbid), and to keep the behavior across all browsers, we manually detect
@@ -462,6 +465,12 @@ class @Mercury.Regions.Editable extends Mercury.Region
     removeSnippet: ->
       @snippet.remove() if @snippet
       Mercury.trigger('hide:toolbar', {type: 'snippet', immediately: true})
+
+    cutSnippet: ->
+      cut_block(@snippet) if @snippet
+      Mercury.trigger('hide:toolbar', {type: 'snippet', immediately: true})
+
+
   }
 
 

data/vendor/assets/javascripts/mercury/regions/snippetable.js.coffee

@@ -121,4 +121,9 @@ class @Mercury.Regions.Snippetable extends Mercury.Region
       @snippet.remove() if @snippet
       Mercury.trigger('hide:toolbar', {type: 'snippet', immediately: true})
 
+    cutSnippet: ->
+      cut_block(@snippet)
+      Mercury.trigger('hide:toolbar', {type: 'snippet', immediately: true})
+
+
   }

data/vendor/assets/javascripts/mercury/snippet.js.coffee

@@ -33,6 +33,7 @@ class @Mercury.Snippet
   constructor: (@name, @identity, options = {}) ->
     @version = 0
     @data = ''
+    @really_save = false
     @history = new Mercury.HistoryBuffer()
     @setOptions(options)
 
@@ -54,7 +55,13 @@ class @Mercury.Snippet
     #    @options_to_save = @options
     save_data = jQuery.extend({}, @options)
     save_data['identity'] = @identity
-    jQuery.ajax Mercury.config.snippets.previewUrl.replace(':name', @name), {
+
+    if @really_save
+      base_url = Mercury.config.snippets.storeUrl
+    else
+      base_url = Mercury.config.snippets.previewUrl
+    
+    jQuery.ajax base_url.replace(':name', @name), {
       headers: Mercury.ajaxHeaders()
       type: Mercury.config.snippets.method
       data: save_data
@@ -69,13 +76,8 @@ class @Mercury.Snippet
 
   displayOptions: ->
     Mercury.snippet = @
-    Mercury.modal (Mercury.config.snippets.optionsUrl.replace(':name', @name) + "&instance_id=#{@identity}"), {
-      title: 'Block Options',
-      handler: 'insertSnippet',
-      loadType: Mercury.config.snippets.method,
-      loadData: @options
-    }
-
+    # TODO: block_options  
+    block_options_window(@name, @identity);
 
   setOptions: (@options) ->
     delete(@options['authenticity_token'])
@@ -84,6 +86,8 @@ class @Mercury.Snippet
     @history.push(@options)
     Mercury.log("Set Options: ", @options)
 
+  reallySave: ->
+    @really_save = true
 
   setVersion: (version = null) ->
     version = parseInt(version)

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kiteditor
 version: !ruby/object:Gem::Version
-  version: 1.0.20
-  prerelease: 
+  version: 1.0.21
 platform: ruby
 authors:
 - DSC OS
@@ -15,241 +14,211 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: paperclip
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: coffee-script
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rocco
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: uglifier
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: ruby-debug19
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: evergreen
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: cucumber-rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: fuubar-cucumber
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: capybara-firebug
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: This is a fork of the wonderful Mercury Rails WYSIWYG editor, modified
@@ -498,27 +467,26 @@ files:
 homepage: http://github.com/dsc-os/kiteditor
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.14
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: An HTML5 editor for use with DSC's Kit, the CCMS.
 test_files:
 - features/loading/loading.feature