tenon 1.0.76 → 1.1.1

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tenon
 version: !ruby/object:Gem::Version
-  version: 1.0.76
+  version: 1.1.1
 platform: ruby
 authors:
 - factor[e] design initiative
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-15 00:00:00.000000000 Z
+date: 2015-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: better_errors
@@ -44,28 +44,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.3
+        version: 2.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.3
+        version: 2.5.0
 - !ruby/object:Gem::Dependency
   name: capybara-webkit
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.1
+        version: 1.7.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.1
+        version: 1.7.1
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
@@ -198,14 +198,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 4.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 4.2.0
 - !ruby/object:Gem::Dependency
   name: awesome_nested_set
   requirement: !ruby/object:Gem::Requirement
@@ -324,14 +324,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.1.2
+        version: 3.5.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.1.2
+        version: 3.5.2
 - !ruby/object:Gem::Dependency
   name: draper
   requirement: !ruby/object:Gem::Requirement
@@ -928,6 +928,110 @@ files:
 - app/assets/images/tenon/tenon_icon.png
 - app/assets/images/tenon/thumb-doc.png
 - app/assets/images/tenon/thumb-video.png
+- app/assets/javascripts/ckeditor/CHANGES.md
+- app/assets/javascripts/ckeditor/LICENSE.md
+- app/assets/javascripts/ckeditor/README.md
+- app/assets/javascripts/ckeditor/adapters/jquery.js
+- app/assets/javascripts/ckeditor/build-config.js
+- app/assets/javascripts/ckeditor/ckeditor.js
+- app/assets/javascripts/ckeditor/config.js
+- app/assets/javascripts/ckeditor/contents.css
+- app/assets/javascripts/ckeditor/lang/en.js
+- app/assets/javascripts/ckeditor/lang/fr-ca.js
+- app/assets/javascripts/ckeditor/plugins/clipboard/dialogs/paste.js
+- app/assets/javascripts/ckeditor/plugins/dialog/dialogDefinition.js
+- app/assets/javascripts/ckeditor/plugins/icons.png
+- app/assets/javascripts/ckeditor/plugins/icons_hidpi.png
+- app/assets/javascripts/ckeditor/plugins/link/dialogs/anchor.js
+- app/assets/javascripts/ckeditor/plugins/link/dialogs/link.js
+- app/assets/javascripts/ckeditor/plugins/link/images/anchor.png
+- app/assets/javascripts/ckeditor/plugins/link/images/hidpi/anchor.png
+- app/assets/javascripts/ckeditor/plugins/linktoasset/plugin.js
+- app/assets/javascripts/ckeditor/plugins/pastefromword/filter/default.js
+- app/assets/javascripts/ckeditor/plugins/sourcedialog/dialogs/sourcedialog.js
+- app/assets/javascripts/ckeditor/samples/css/samples.css
+- app/assets/javascripts/ckeditor/samples/img/github-top.png
+- app/assets/javascripts/ckeditor/samples/img/header-bg.png
+- app/assets/javascripts/ckeditor/samples/img/header-separator.png
+- app/assets/javascripts/ckeditor/samples/img/logo.png
+- app/assets/javascripts/ckeditor/samples/img/navigation-tip.png
+- app/assets/javascripts/ckeditor/samples/index.html
+- app/assets/javascripts/ckeditor/samples/js/sample.js
+- app/assets/javascripts/ckeditor/samples/js/sf.js
+- app/assets/javascripts/ckeditor/samples/old/ajax.html
+- app/assets/javascripts/ckeditor/samples/old/api.html
+- app/assets/javascripts/ckeditor/samples/old/appendto.html
+- app/assets/javascripts/ckeditor/samples/old/assets/inlineall/logo.png
+- app/assets/javascripts/ckeditor/samples/old/assets/outputxhtml/outputxhtml.css
+- app/assets/javascripts/ckeditor/samples/old/assets/posteddata.php
+- app/assets/javascripts/ckeditor/samples/old/assets/sample.jpg
+- app/assets/javascripts/ckeditor/samples/old/assets/uilanguages/languages.js
+- app/assets/javascripts/ckeditor/samples/old/datafiltering.html
+- app/assets/javascripts/ckeditor/samples/old/dialog/assets/my_dialog.js
+- app/assets/javascripts/ckeditor/samples/old/dialog/dialog.html
+- app/assets/javascripts/ckeditor/samples/old/divreplace.html
+- app/assets/javascripts/ckeditor/samples/old/enterkey/enterkey.html
+- app/assets/javascripts/ckeditor/samples/old/index.html
+- app/assets/javascripts/ckeditor/samples/old/inlineall.html
+- app/assets/javascripts/ckeditor/samples/old/inlinebycode.html
+- app/assets/javascripts/ckeditor/samples/old/inlinetextarea.html
+- app/assets/javascripts/ckeditor/samples/old/jquery.html
+- app/assets/javascripts/ckeditor/samples/old/readonly.html
+- app/assets/javascripts/ckeditor/samples/old/replacebyclass.html
+- app/assets/javascripts/ckeditor/samples/old/replacebycode.html
+- app/assets/javascripts/ckeditor/samples/old/sample.css
+- app/assets/javascripts/ckeditor/samples/old/sample.js
+- app/assets/javascripts/ckeditor/samples/old/sample_posteddata.php
+- app/assets/javascripts/ckeditor/samples/old/sourcedialog/sourcedialog.html
+- app/assets/javascripts/ckeditor/samples/old/tabindex.html
+- app/assets/javascripts/ckeditor/samples/old/toolbar/toolbar.html
+- app/assets/javascripts/ckeditor/samples/old/uicolor.html
+- app/assets/javascripts/ckeditor/samples/old/uilanguages.html
+- app/assets/javascripts/ckeditor/samples/old/wysiwygarea/fullpage.html
+- app/assets/javascripts/ckeditor/samples/old/xhtmlstyle.html
+- app/assets/javascripts/ckeditor/samples/toolbarconfigurator/css/fontello.css
+- app/assets/javascripts/ckeditor/samples/toolbarconfigurator/font/LICENSE.txt
+- app/assets/javascripts/ckeditor/samples/toolbarconfigurator/font/config.json
+- app/assets/javascripts/ckeditor/samples/toolbarconfigurator/font/fontello.eot
+- app/assets/javascripts/ckeditor/samples/toolbarconfigurator/font/fontello.svg
+- app/assets/javascripts/ckeditor/samples/toolbarconfigurator/font/fontello.ttf
+- app/assets/javascripts/ckeditor/samples/toolbarconfigurator/font/fontello.woff
+- app/assets/javascripts/ckeditor/samples/toolbarconfigurator/index.html
+- app/assets/javascripts/ckeditor/samples/toolbarconfigurator/js/abstracttoolbarmodifier.js
+- app/assets/javascripts/ckeditor/samples/toolbarconfigurator/js/fulltoolbareditor.js
+- app/assets/javascripts/ckeditor/samples/toolbarconfigurator/js/toolbarmodifier.js
+- app/assets/javascripts/ckeditor/samples/toolbarconfigurator/js/toolbartextmodifier.js
+- app/assets/javascripts/ckeditor/samples/toolbarconfigurator/lib/codemirror/LICENSE
+- app/assets/javascripts/ckeditor/samples/toolbarconfigurator/lib/codemirror/codemirror.css
+- app/assets/javascripts/ckeditor/samples/toolbarconfigurator/lib/codemirror/codemirror.js
+- app/assets/javascripts/ckeditor/samples/toolbarconfigurator/lib/codemirror/javascript.js
+- app/assets/javascripts/ckeditor/samples/toolbarconfigurator/lib/codemirror/neo.css
+- app/assets/javascripts/ckeditor/samples/toolbarconfigurator/lib/codemirror/show-hint.css
+- app/assets/javascripts/ckeditor/samples/toolbarconfigurator/lib/codemirror/show-hint.js
+- app/assets/javascripts/ckeditor/skins/moono-dark/dialog.css
+- app/assets/javascripts/ckeditor/skins/moono-dark/dialog_ie.css
+- app/assets/javascripts/ckeditor/skins/moono-dark/dialog_ie7.css
+- app/assets/javascripts/ckeditor/skins/moono-dark/dialog_ie8.css
+- app/assets/javascripts/ckeditor/skins/moono-dark/dialog_iequirks.css
+- app/assets/javascripts/ckeditor/skins/moono-dark/editor.css
+- app/assets/javascripts/ckeditor/skins/moono-dark/editor_gecko.css
+- app/assets/javascripts/ckeditor/skins/moono-dark/editor_ie.css
+- app/assets/javascripts/ckeditor/skins/moono-dark/editor_ie7.css
+- app/assets/javascripts/ckeditor/skins/moono-dark/editor_ie8.css
+- app/assets/javascripts/ckeditor/skins/moono-dark/editor_iequirks.css
+- app/assets/javascripts/ckeditor/skins/moono-dark/icons.png
+- app/assets/javascripts/ckeditor/skins/moono-dark/icons_hidpi.png
+- app/assets/javascripts/ckeditor/skins/moono-dark/images/arrow.png
+- app/assets/javascripts/ckeditor/skins/moono-dark/images/close.png
+- app/assets/javascripts/ckeditor/skins/moono-dark/images/hidpi/close.png
+- app/assets/javascripts/ckeditor/skins/moono-dark/images/hidpi/lock-open.png
+- app/assets/javascripts/ckeditor/skins/moono-dark/images/hidpi/lock.png
+- app/assets/javascripts/ckeditor/skins/moono-dark/images/hidpi/refresh.png
+- app/assets/javascripts/ckeditor/skins/moono-dark/images/lock-open.png
+- app/assets/javascripts/ckeditor/skins/moono-dark/images/lock.png
+- app/assets/javascripts/ckeditor/skins/moono-dark/images/refresh.png
+- app/assets/javascripts/ckeditor/skins/moono-dark/readme.md
+- app/assets/javascripts/ckeditor/styles.js
 - app/assets/javascripts/tenon/controllers/assets.js.coffee
 - app/assets/javascripts/tenon/controllers/index.js.coffee
 - app/assets/javascripts/tenon/controllers/tenon.js.coffee
@@ -939,6 +1043,7 @@ files:
 - app/assets/javascripts/tenon/features/box_toggles.js.coffee
 - app/assets/javascripts/tenon/features/cocoon_hooks.js.coffee
 - app/assets/javascripts/tenon/features/date_time_picker.js.coffee
+- app/assets/javascripts/tenon/features/editor.js.coffee
 - app/assets/javascripts/tenon/features/file_select_widget.js.erb
 - app/assets/javascripts/tenon/features/flash.js.coffee
 - app/assets/javascripts/tenon/features/focus_first_field.js.coffee
@@ -949,7 +1054,6 @@ files:
 - app/assets/javascripts/tenon/features/item_version_autosave.js.coffee
 - app/assets/javascripts/tenon/features/item_version_index_handler.js.coffee
 - app/assets/javascripts/tenon/features/main_menu.js.coffee
-- app/assets/javascripts/tenon/features/medium.js.coffee
 - app/assets/javascripts/tenon/features/modal_forms.js.coffee
 - app/assets/javascripts/tenon/features/modal_windows.js.coffee
 - app/assets/javascripts/tenon/features/multiple_asset_attachment.js.coffee
@@ -1014,53 +1118,53 @@ files:
 - app/assets/javascripts/tenon/tenon.js
 - app/assets/javascripts/tenon/tenon_dispatcher.js.coffee
 - app/assets/javascripts/tenon/tenon_manifest.js
-- app/assets/stylesheets/tenon/colors-custom.css.scss
-- app/assets/stylesheets/tenon/colors-named.css.scss
-- app/assets/stylesheets/tenon/helpers.css.scss
-- app/assets/stylesheets/tenon/layout/assets.css.scss
-- app/assets/stylesheets/tenon/layout/breakpoints.css.scss
-- app/assets/stylesheets/tenon/layout/global.css.scss
-- app/assets/stylesheets/tenon/layout/grid.css.scss
-- app/assets/stylesheets/tenon/layout/main-nav.css.scss
-- app/assets/stylesheets/tenon/layout/margins.css.scss
-- app/assets/stylesheets/tenon/layout/mobile.css.scss
-- app/assets/stylesheets/tenon/layout/sidebar.css.scss
-- app/assets/stylesheets/tenon/layout/util-nav.css.scss
-- app/assets/stylesheets/tenon/mixins.css.scss
-- app/assets/stylesheets/tenon/styleguide.css.scss
-- app/assets/stylesheets/tenon/tenon.css.scss
-- app/assets/stylesheets/tenon/typography.css.scss
-- app/assets/stylesheets/tenon/ui/alerts.css.scss
-- app/assets/stylesheets/tenon/ui/asset-attachment.css.scss
-- app/assets/stylesheets/tenon/ui/asset-cropping.css.scss
-- app/assets/stylesheets/tenon/ui/asset-uploads.css.scss
-- app/assets/stylesheets/tenon/ui/buttons.css.scss
-- app/assets/stylesheets/tenon/ui/callouts.css.scss
-- app/assets/stylesheets/tenon/ui/comments.css.scss
-- app/assets/stylesheets/tenon/ui/forms.css.scss
-- app/assets/stylesheets/tenon/ui/generic-loader.css.scss
-- app/assets/stylesheets/tenon/ui/header-tools.css.scss
-- app/assets/stylesheets/tenon/ui/i18n.css.scss
-- app/assets/stylesheets/tenon/ui/list-style-toggle.css.scss
-- app/assets/stylesheets/tenon/ui/login.css.scss
-- app/assets/stylesheets/tenon/ui/medium-editor.css.scss
-- app/assets/stylesheets/tenon/ui/modals.css.scss
-- app/assets/stylesheets/tenon/ui/pagination.css.scss
-- app/assets/stylesheets/tenon/ui/progress-bars.css.scss
-- app/assets/stylesheets/tenon/ui/quick-search.css.scss
-- app/assets/stylesheets/tenon/ui/record-grids.css.scss
-- app/assets/stylesheets/tenon/ui/record-lists.css.scss
-- app/assets/stylesheets/tenon/ui/section-headers.css.scss
-- app/assets/stylesheets/tenon/ui/select2-custom.css.scss
-- app/assets/stylesheets/tenon/ui/tables.css.scss
-- app/assets/stylesheets/tenon/ui/tabs.css.scss
-- app/assets/stylesheets/tenon/ui/tenon-content-library.css.scss
-- app/assets/stylesheets/tenon/ui/tenon-content-popped-out.css.scss
-- app/assets/stylesheets/tenon/ui/tenon-content.css.scss
-- app/assets/stylesheets/tenon/ui/thinking.css.scss
-- app/assets/stylesheets/tenon/ui/toolbox.css.scss
-- app/assets/stylesheets/tenon/z-indexes.css.scss
-- app/assets/stylesheets/tenon_addons.css.scss
+- app/assets/stylesheets/tenon/colors-custom.scss
+- app/assets/stylesheets/tenon/colors-named.scss
+- app/assets/stylesheets/tenon/helpers.scss
+- app/assets/stylesheets/tenon/layout/assets.scss
+- app/assets/stylesheets/tenon/layout/breakpoints.scss
+- app/assets/stylesheets/tenon/layout/global.scss
+- app/assets/stylesheets/tenon/layout/grid.scss
+- app/assets/stylesheets/tenon/layout/main-nav.scss
+- app/assets/stylesheets/tenon/layout/margins.scss
+- app/assets/stylesheets/tenon/layout/mobile.scss
+- app/assets/stylesheets/tenon/layout/sidebar.scss
+- app/assets/stylesheets/tenon/layout/util-nav.scss
+- app/assets/stylesheets/tenon/mixins.scss
+- app/assets/stylesheets/tenon/styleguide.scss
+- app/assets/stylesheets/tenon/tenon.scss
+- app/assets/stylesheets/tenon/typography.scss
+- app/assets/stylesheets/tenon/ui/alerts.scss
+- app/assets/stylesheets/tenon/ui/asset-attachment.scss
+- app/assets/stylesheets/tenon/ui/asset-cropping.scss
+- app/assets/stylesheets/tenon/ui/asset-uploads.scss
+- app/assets/stylesheets/tenon/ui/buttons.scss
+- app/assets/stylesheets/tenon/ui/callouts.scss
+- app/assets/stylesheets/tenon/ui/comments.scss
+- app/assets/stylesheets/tenon/ui/forms.scss
+- app/assets/stylesheets/tenon/ui/generic-loader.scss
+- app/assets/stylesheets/tenon/ui/header-tools.scss
+- app/assets/stylesheets/tenon/ui/i18n.scss
+- app/assets/stylesheets/tenon/ui/list-style-toggle.scss
+- app/assets/stylesheets/tenon/ui/login.scss
+- app/assets/stylesheets/tenon/ui/medium-editor.scss
+- app/assets/stylesheets/tenon/ui/modals.scss
+- app/assets/stylesheets/tenon/ui/pagination.scss
+- app/assets/stylesheets/tenon/ui/progress-bars.scss
+- app/assets/stylesheets/tenon/ui/quick-search.scss
+- app/assets/stylesheets/tenon/ui/record-grids.scss
+- app/assets/stylesheets/tenon/ui/record-lists.scss
+- app/assets/stylesheets/tenon/ui/section-headers.scss
+- app/assets/stylesheets/tenon/ui/select2-custom.scss
+- app/assets/stylesheets/tenon/ui/tables.scss
+- app/assets/stylesheets/tenon/ui/tabs.scss
+- app/assets/stylesheets/tenon/ui/tenon-content-library.scss
+- app/assets/stylesheets/tenon/ui/tenon-content-popped-out.scss
+- app/assets/stylesheets/tenon/ui/tenon-content.scss
+- app/assets/stylesheets/tenon/ui/thinking.scss
+- app/assets/stylesheets/tenon/ui/toolbox.scss
+- app/assets/stylesheets/tenon/z-indexes.scss
+- app/assets/stylesheets/tenon_addons.scss
 - app/controllers/tenon/assets_controller.rb
 - app/controllers/tenon/base_controller.rb
 - app/controllers/tenon/comments_controller.rb
@@ -1190,6 +1294,8 @@ files:
 - app/views/tenon/events/index.html.haml
 - app/views/tenon/events/index.json.jbuilder
 - app/views/tenon/events/new.html.haml
+- app/views/tenon/fields/_asset.html.haml
+- app/views/tenon/fields/_rich_text.html.haml
 - app/views/tenon/galleries/_form.html.haml
 - app/views/tenon/galleries/_photo_fields.html.haml
 - app/views/tenon/galleries/edit.html.haml
@@ -1230,7 +1336,6 @@ files:
 - app/views/tenon/settings/_general.html.haml
 - app/views/tenon/settings/_seo.html.haml
 - app/views/tenon/settings/show.html.haml
-- app/views/tenon/shared/_asset_field.html.haml
 - app/views/tenon/shared/_i18n_language_nav.html.haml
 - app/views/tenon/shared/_main_nav.html.haml
 - app/views/tenon/shared/_pagination.json.jbuilder
@@ -1483,11 +1588,11 @@ files:
 - vendor/assets/javascripts/underscore.inflection.js
 - vendor/assets/javascripts/underscore.string.js
 - vendor/assets/javascripts/uri.js
-- vendor/assets/stylesheets/bootstrap.css.scss
 - vendor/assets/stylesheets/bootstrap.datetimepicker.css
-- vendor/assets/stylesheets/bootstrap.tables.css.scss
+- vendor/assets/stylesheets/bootstrap.scss
+- vendor/assets/stylesheets/bootstrap.tables.scss
 - vendor/assets/stylesheets/jquery.Jcrop.css
-- vendor/assets/stylesheets/jscrollpane.css.scss
+- vendor/assets/stylesheets/jscrollpane.scss
 - vendor/assets/stylesheets/select2.css
 homepage: http://factore.ca/tenon
 licenses: []
@@ -1508,7 +1613,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: A highly flexible mountable Rails CMS built for rapid application development.

data/app/assets/javascripts/tenon/features/medium.js.coffee

@@ -1,13 +0,0 @@
-class Tenon.features.Medium
-  constructor: ($el = $('.editable-text')) ->
-    Tenon.mediumEditor = new MediumEditor $('.editable-text'), @opts
-
-  opts:
-    placeholder: ''
-    cssClasses:
-      placeholder: 'medium-placeholder'
-    forcePlainText: true
-    firstHeader: 'h3'
-    secondHeader: 'h4'
-    buttons: ['bold', 'italic', 'underline', 'anchor', 'header1', 'header2', 'quote', 'unorderedlist', 'orderedlist']
-    buttonLabels: 'fontawesome'

data/app/views/tenon/shared/_asset_field.html.haml

@@ -1,29 +0,0 @@
-/ TODO call this partial with local variable named asset_name rather than asset
-- asset_name = asset
-- proxy_attachment = f.object.send(asset_name)
-%label.asset-label= asset_name.to_s.titleize
-.tn-tc-asset-field
-  = f.hidden_field "#{asset_name}_id", class: 'asset-id-field'
-  .thumbnail
-    - if proxy_attachment.try(:asset)
-      = asset_icon(proxy_attachment.asset)
-    - else
-      = image_tag default_asset_thumbnail(proxy_attachment)
-  .details
-    .asset-info
-      - if proxy_attachment
-        = proxy_attachment.display_name
-      - else
-        No asset selected.
-
-    .browse-button-holder{:class => ('with-remove' if defined?(remove_association) && remove_association)}
-      .browse-button
-        = link_to 'Browse', new_item_asset_path, class: 'btn btn-comp browse', data: {'modal-remote' => true, 'modal-title' => "Select #{asset_name.to_s.titleize}", 'modal-handler' => 'Tenon.features.AssetAttachment'}
-        - if defined?(remove_association) && remove_association
-          %small
-            or
-            = link_to_remove_association "remove", f
-        - else
-          %small
-            or
-            = link_to "remove", '#', class: 'remove-asset'