redditor 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d79d7cca7ef807b71abea058efdaf85807e43824
-  data.tar.gz: 370f711bb07e75df426a14aaefdce073dba7e657
+  metadata.gz: a898a45dff55b68a00cbf7bdc623a09c2d30d4ec
+  data.tar.gz: 0e44dca1197cae9e47efce1db64ee3ccd4fe522e
 SHA512:
-  metadata.gz: 280d5530c4740cb1fd2fbe834367a800795ad8c7781769dd25dbc19eb82b32f34aab1cbf660e431967b5c400fda701fade9aeb59e5e3f10cb3324c70ad46e10e
-  data.tar.gz: d767dc371112471e7634e38453af631e17cf21b3eb3331b4a5d5a67cc7bb990d59fd130659a050b025face964c210c01ff898aaf47dd53d88bb34bec096e8413
+  metadata.gz: 8893850c838ec8f61e41a08b2c9dfca45fff6cc3ba3fe615c92d5da5f91b661ab7738703cf2a0b3efc7fc23008fb935acb75525b31eecc3d942cece6701a69bc
+  data.tar.gz: e8f741718461b281c7531087df09402de04a7a8ff22007fc1cd24e860f0150a3a1a41c50af453a15934d5fcceae35bd73aafa72fc74f816382da137149942c00

data/Gemfile

@@ -8,7 +8,8 @@ gem 'haml'
 gem 'coffee-rails'
 gem 'jquery-rails'
 gem 'sass-rails'
-gem 'compass-rails', github: 'milgner/compass-rails', ref: '1749c06f15dc4b058427e7969810457213647fb8'
+gem 'fileapi', git: 'git@github.com:redde/fileapi.git'
+
 # Declare your gem's dependencies in redditor.gemspec.
 # Bundler will treat runtime dependencies like base dependencies, and
 # development dependencies will be added by default to the :development group.

data/app/assets/javascripts/redditor/application.js

@@ -11,5 +11,4 @@
 // about supported directives.
 //
 //= require jquery-ui.min.js
-//= require redditor/redditor
-//= require fileapi/fileapi
+//= require redditor/redditor

data/app/assets/javascripts/redditor/redditor.coffee

@@ -1,3 +1,6 @@
+#= require fileapi
+#= require fileapi/uploader
+
 window.REDDE = {redditor: {}}
 REDDE.redditor.sliderBlockImagesSortableParams =
   scroll: false
@@ -33,7 +36,7 @@ REDDE.redditor.parameterizationForm = (box) ->
 REDDE.redditor.setPositions = ->
   $el = REDDE.redditor.$el
   $el.find($el.sortable("option", "items")).each (i) ->
-    $(this).find("input.js-position").val i # временное решение с input type=number
+    $(@).find("input.redditor__position").val i
 
 REDDE.redditor.sortList = ->
   sortArray = $.map REDDE.redditor.$el.find("dd"), (n) ->
@@ -89,14 +92,14 @@ $ ->
       $(@).removeClass("now-sortable")
       return
 
-  .on "ajax:beforeSend", "a.update-data", (event, xhr, status) ->
+  .on "ajax:beforeSend", "a.redditor__update", (event, xhr, status) ->
     box = $(@).closest "dd"
     params = REDDE.redditor.parameterizationForm(box)
     status.url += "?" + $.param(params)
 
   $("ul.slider-block-images").sortable REDDE.redditor.sliderBlockImagesSortableParams
 
-  $('div.redditor-add-blocks').on "ajax:beforeSend", "a.new-block", (event, xhr, status) ->
+  $('div.redditor__add-blocks').on "ajax:beforeSend", "a.redditor__add", (event, xhr, status) ->
     status.url += "?" + $.param(content_block: {temp_id: new Date().getTime()}) # generate uniq id
 
 #! jquery-serializeForm - Make an object out of form elements - v1.1.1 - 2013-01-21

data/app/assets/stylesheets/redditor/application.css.scss

@@ -1,29 +1,29 @@
 /*
- * This is a manifest file that'll be compiled into application.css, which will include all the files
- * listed below.
- *
- * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets,
- * or vendor/assets/stylesheets of plugins, if any, can be referenced here using a relative path.
- *
- * You're free to add application-wide styles to this file and they'll appear at the top of the
- * compiled file, but it's generally better to create a new file per style scope.
- *
- *= require redditor/redditor
- */
+* This is a manifest file that'll be compiled into application.css, which will include all the files
+* listed below.
+*
+* Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets,
+* or vendor/assets/stylesheets of plugins, if any, can be referenced here using a relative path.
+*
+* You're free to add application-wide styles to this file and they'll appear at the top of the
+* compiled file, but it's generally better to create a new file per style scope.
+*
+*= require redditor/redditor
+*/
 
-@import "compass";
-
- html {
+html {
   font: 12px "Lucida Grande", "Lucida Sans Unicode", helvetica, arial, verdana, sans-serif;
- }
+}
 
- form.edit_article {
+form.edit_article {
   margin:0 10px;
- }
+}
 
- .text-block-input {
+.text-block-input {
   width: 100%;
-  @include box-sizing(border-box);
+  -webkit-box-sizing: border-box;
+  -moz-box-sizing: border-box;
+  box-sizing: border-box;
 }
 
 input[type=submit] {
@@ -32,16 +32,22 @@ input[type=submit] {
   display: inline-block;
   background:#ccc;
   cursor: pointer;
-  @include background(linear-gradient(#fff, #ccc));
+  background:-webkit-linear-gradient(top, #fff, #ccc);
+  background:-moz-linear-gradient(top, #fff, #ccc);
+  background:-o-linear-gradient(top, #fff, #ccc);
+  background:linear-gradient(to bottom, #fff, #ccc);
   border-radius: 3px;
   box-shadow: 1px 1px 2px #ccc;
   border: 1px solid #999;
   text-transform: lowercase;
   outline: none;
   &:hover {
-    @include background(linear-gradient(rgba(#fff, 0.8), rgba(#ccc, 0.8)));
+    background: -webkit-linear-gradient(top, rgba(#fff, 0.8), rgba(#ccc, 0.8));
+    background: -moz-linear-gradient(top, rgba(#fff, 0.8), rgba(#ccc, 0.8));
+    background: -o-linear-gradient(top, rgba(#fff, 0.8), rgba(#ccc, 0.8));
+    background: linear-gradient(to bottom, rgba(#fff, 0.8), rgba(#ccc, 0.8));
   }
   &:active {
-    @include transform(translateY(1px));
+    transform: translateY(1px);
   }
 }

data/app/assets/stylesheets/redditor/redditor.css.scss

@@ -1,4 +1,5 @@
-@import "compass";
+//= require fileapi
+
 dl.redditor {
   dd {
     /*нельзя задавать position-relative, иначе глючит сортировка в хроме*/
@@ -14,21 +15,14 @@ dl.redditor {
     height: 50px !important; overflow: hidden;
     .tit-form {display: block;}
   }
-  label.delete {
-    position: absolute; left:100%; bottom: 100%; white-space:nowrap;
-    @include transform(rotate(90deg));
-    @include transform-origin(0, 100%);
-  }
   .ui-sortable-helper, .ui-sortable-placeholder {
     /*max-height: 200px !important; overflow: hidden;*/
   }
-  .upload-area {
-    overflow: hidden; margin-top: 10px;
-  }
 }
 
 ul.slider-block-images {
   overflow: hidden;
+  padding: 0;
   li {
     margin: 0 5px 5px 0; list-style: none;
     float: left; position: relative;
@@ -38,14 +32,12 @@ ul.slider-block-images {
   }
 }
 
-div.redditor-add-blocks {
+.redditor__add-blocks {
   margin:10px -10px; padding:10px;
-  > p {
-    overflow: hidden;
-  }
 }
-.control-data {float: right;}
-.delete-data, .update-data {
+
+.redditor__control {float: right;}
+.redditor__delete, .redditor__update {
   text-decoration: none;
   display: inline-block;
   text-align: center; min-width: 10px; padding: 0 5px;
@@ -53,51 +45,88 @@ div.redditor-add-blocks {
   border: 1px solid #C2C2C2; border-radius: 15px;
   background: #F8F8F8;
 }
-.delete-data { color: #A72522;}
-.update-data { color: green;}
+
+.redditor__delete {
+  color: #A72522;
+  &:before {content: '✘'}
+}
+.redditor__update { 
+  color: green;
+  &:before {content: '✔'}
+}
 
 .form-name {
   margin-top: 25px;
 }
+
 .tit-form {
   display: none; margin-top: -25px; text-align: center; font-size: 18px;
   line-height: 30px; vertical-align: middle;
   img { width: 30px; display: inline-block; vertical-align: middle;}
 }
+
 .line-form {
   display: inline-block; margin-right: 5px;
 }
+
 .del-item {
   text-decoration: none; position: absolute; right: 1px; bottom: 1px;
   width: 22px; height: 22px;
   background: #eee image-url('redditor/trash.png') center no-repeat;
   border-radius: 15px; border: 1px solid #aaa;
 }
+
 .full-width {
   width: 100%; box-sizing: border-box;
 }
-.add-txt, .add-video, .add-photo, .add-slider {
-  text-decoration: none; color: #222; float: left; padding: 4px 10px 4px 25px;
-  border-radius: 3px; border: 1px solid #ccc; font-size: 11px; margin-right: 3px;
-}
-.add-txt {
-  @include background(image-url('redditor/add_txt.png') 3px center no-repeat, linear-gradient(top, #fff 0%, #f5f5f5 49%, #ececec 50%, #eee 100%));
-}
-.add-video {
-  @include background(image-url('redditor/add_video.png') 3px center no-repeat, linear-gradient(top, #fff 0%, #f5f5f5 49%, #ececec 50%, #eee 100%));
-}
-.add-photo {
-  @include background(image-url('redditor/add_photo.png') 3px center no-repeat, linear-gradient(top, #fff 0%, #f5f5f5 49%, #ececec 50%, #eee 100%));
+
+.redditor__add {
+  text-decoration: none; 
+  color: #222; 
+  display: inline-block;
+  padding: 4px 10px 4px 25px;
+  border-radius: 3px; 
+  border: 1px solid #ccc; 
+  font-size: 11px; margin-right: 3px;
 }
-.add-slider {
-  @include background(image-url('redditor/add_slider.png') 3px center no-repeat, linear-gradient(top, #fff 0%, #f5f5f5 49%, #ececec 50%, #eee 100%));
+
+.redditor__add_txt {
+  background:#f5f5f5 image-url('redditor/add_txt.png') 3px center no-repeat;
+  background: image-url('redditor/add_txt.png') 3px center no-repeat, -webkit-linear-gradient(top, #fff 0%, #f5f5f5 49%, #ececec 50%, #eee 100%);
+  background: image-url('redditor/add_txt.png') 3px center no-repeat, -moz-gradient(top, #fff 0%, #f5f5f5 49%, #ececec 50%, #eee 100%);
+  background: image-url('redditor/add_txt.png') 3px center no-repeat, -o-gradient(top, #fff 0%, #f5f5f5 49%, #ececec 50%, #eee 100%);
+  background: image-url('redditor/add_txt.png') 3px center no-repeat, linear-gradient(to bottom, #fff 0%, #f5f5f5 49%, #ececec 50%, #eee 100%);
+}
+.redditor__add_video {
+  background:#f5f5f5 image-url('redditor/add_video.png') 3px center no-repeat;
+  background: image-url('redditor/add_video.png') 3px center no-repeat, -webkit-linear-gradient(top, #fff 0%, #f5f5f5 49%, #ececec 50%, #eee 100%);
+  background: image-url('redditor/add_video.png') 3px center no-repeat, -moz-linear-gradient(top, #fff 0%, #f5f5f5 49%, #ececec 50%, #eee 100%);
+  background: image-url('redditor/add_video.png') 3px center no-repeat, -o-linear-gradient(top, #fff 0%, #f5f5f5 49%, #ececec 50%, #eee 100%);
+  background: image-url('redditor/add_video.png') 3px center no-repeat, linear-gradient(to bottom, #fff 0%, #f5f5f5 49%, #ececec 50%, #eee 100%);
+}
+.redditor__add_photo {
+  background:#f5f5f5 image-url('redditor/add_photo.png') 3px center no-repeat;
+  background: image-url('redditor/add_photo.png') 3px center no-repeat, -webkit-linear-gradient(top, #fff 0%, #f5f5f5 49%, #ececec 50%, #eee 100%);
+  background: image-url('redditor/add_photo.png') 3px center no-repeat, -moz-linear-gradient(top, #fff 0%, #f5f5f5 49%, #ececec 50%, #eee 100%);
+  background: image-url('redditor/add_photo.png') 3px center no-repeat, -o-linear-gradient(top, #fff 0%, #f5f5f5 49%, #ececec 50%, #eee 100%);
+  background: image-url('redditor/add_photo.png') 3px center no-repeat, linear-gradient(to bottom, #fff 0%, #f5f5f5 49%, #ececec 50%, #eee 100%);
+}
+.redditor__add_slider {
+  background:#f5f5f5 image-url('redditor/add_slider.png') 3px center no-repeat;
+  background: image-url('redditor/add_slider.png') 3px center no-repeat, -webkit-linear-gradient(top, #fff 0%, #f5f5f5 49%, #ececec 50%, #eee 100%);
+  background: image-url('redditor/add_slider.png') 3px center no-repeat, -moz-linear-gradient(top, #fff 0%, #f5f5f5 49%, #ececec 50%, #eee 100%);
+  background: image-url('redditor/add_slider.png') 3px center no-repeat, -o-linear-gradient(top, #fff 0%, #f5f5f5 49%, #ececec 50%, #eee 100%);
+  background: image-url('redditor/add_slider.png') 3px center no-repeat, linear-gradient(to bottom, #fff 0%, #f5f5f5 49%, #ececec 50%, #eee 100%);
 }
+
 a.redactor_btn_format {
   background: image-url('redditor/no_format_text.png') center no-repeat !important;
 }
 a.redactor_btn_divide {
   background: image-url('redditor/destroy_block_text.png') center no-repeat !important;
 }
+
+// стили для тестирования
 // dl.redditor dd:before {
 //   content: "class: " attr(class); display: block; padding: 2px; background: #fcc;
 // }

data/app/controllers/redditor/admin/pages_controller.rb

@@ -6,7 +6,7 @@ class Redditor::Admin::PagesController < Redditor::Admin::BaseController
   def sort
     params[:sort].each do |k, v|
       v.each do |klass, info|
-        klass.camelcase.constantize.find_by_id(info[:index]).update_attributes(position: info[:position]) rescue nil
+        "Redditor::#{klass.camelcase}".constantize.find_by_id(info[:index]).update_attributes(position: info[:position]) rescue nil
       end
     end
 

data/app/helpers/redditor/pages_helper.rb

@@ -9,7 +9,7 @@ module Redditor
         content_tag(:dd, :id => "#{association.to_s.singularize}_#{id}") do
           tag(:div, class: "handle") +
           link_to("Удалить", "javascript:void(0);", onclick: "if (confirm('dfasdsa')) $(this).closest('dd').remove();") + "\s" +
-          link_to("Обновить", [:admin, @article.page, association], method: "post", class: "update-data", remote: true, data: {disable_with: "Обновляется"}) + "\s" +
+          link_to("Обновить", [:admin, @article.page, association], method: "post", class: "redditor__update", remote: true, data: {disable_with: "Обновляется"}) + "\s" +
           render("admin/pages/" + association.to_s.singularize, f: builder)
         end
       end

data/app/views/redditor/admin/pages/_content_block.haml

@@ -1,16 +1,37 @@
 .handle
 
 - if content_block.new_record?
-  .control-data
-    = link_to "✘", "javascript:void(0);", onclick: "if (confirm('#{t "redditor.remove?"}')) $(this).closest('dd').remove();", class: "delete-data"
-    = link_to "✔", [redditor, :admin, p.object, content_block], method: "post", class: "update-data", remote: true, data: {:disable_with => "✔ #{t "redditor.saving"}"}
+  .redditor__control
+    = link_to "", 
+      "javascript:void(0);", 
+      class: "redditor__delete",
+      onclick: "if (confirm('#{t "redditor.remove?"}')) $(this).closest('dd').remove();"
+    
+    = link_to "", 
+      [redditor, :admin, p.object, content_block], 
+      method: "post", 
+      class: "redditor__update", 
+      remote: true, 
+      data: {:disable_with => t("redditor.saving")}
+
 - else
-  .control-data
-    = link_to "✘", [redditor, :admin, p.object, content_block], :method => :delete, remote: true, data: {confirm: "Вы, действительно, хотите удалить контент-блок?", disable_with: "✘ #{t "redditor.deleting"}"}, class: "delete-data"
-    = link_to "✔", [redditor, :admin, p.object, content_block], method: "put", class: "update-data", remote: true, data: {disable_with: "✔ #{t "redditor.saving"}"}
+  .redditor__control
+    = link_to "", 
+      [redditor, :admin, p.object, content_block], 
+      class: "redditor__delete",
+      :method => :delete, 
+      remote: true, 
+      data: {confirm: "Вы, действительно, хотите удалить контент-блок?", disable_with: t("redditor.deleting")}
+    
+    = link_to "", 
+      [redditor, :admin, p.object, content_block], 
+      class: "redditor__update", 
+      remote: true,
+      method: "put",
+      data: {disable_with: t("redditor.saving")}
 
 = p.fields_for content_block.class.name.underscore.sub('redditor/', '').pluralize.to_sym, content_block do |f|
   %div.form-name{data: {"object-name" => f.object.temp_id.present? ? f.object_name.sub!(/\[\d*\]/, "[#{f.object.temp_id}]") : f.object_name}, id: "#{content_block.class.name.underscore.sub(/\Aredditor\//, '')}_#{content_block.id.nil? ? f.object.temp_id : content_block.id}"}
-    = f.text_field :position, class: 'js-position', hidden: true
+    = f.text_field :position, class: 'redditor__position', hidden: true
     = render :partial => "redditor/admin/pages/#{content_block.class.name.underscore.sub('redditor/', '')}", locals: {f: f}
     = f.hidden_field :temp_id

data/app/views/redditor/admin/pages/_page.haml

@@ -5,9 +5,9 @@
       - p.object.content_blocks.each do |content_block|
         = render partial: "redditor/admin/pages/content_block", locals: {p: p, page: p.object, content_block: content_block}, :layout => "redditor/admin/pages/wrap_dd"
 
-    %div.redditor-add-blocks
+    %div.redditor__add-blocks
       %p
-        = link_to t('redditor.add.text_block'), redditor.new_admin_page_text_block_path(f.object.page), remote: true, class: "new-block add-txt"
-        = link_to t('redditor.add.video_block'), redditor.new_admin_page_video_block_path(f.object.page), remote: true, class: "new-block add-video"
-        = link_to t('redditor.add.image_block'), redditor.new_admin_page_image_block_path(f.object.page), remote: true, class: "new-block add-photo"
-        = link_to t('redditor.add.slider_block'), redditor.admin_page_slider_blocks_path(f.object.page), remote: true, method: 'POST', class: "new-block add-slider"
+        = link_to t('redditor.add.text_block'), redditor.new_admin_page_text_block_path(f.object.page), remote: true, class: "redditor__add redditor__add_txt"
+        = link_to t('redditor.add.video_block'), redditor.new_admin_page_video_block_path(f.object.page), remote: true, class: "redditor__add redditor__add_video"
+        = link_to t('redditor.add.image_block'), redditor.new_admin_page_image_block_path(f.object.page), remote: true, class: "redditor__add redditor__add_photo"
+        = link_to t('redditor.add.slider_block'), redditor.admin_page_slider_blocks_path(f.object.page), remote: true, method: 'POST', class: "redditor__add redditor__add_slider"

data/config/locales/redditor.en.yml

@@ -11,8 +11,8 @@ en:
     delete_image: "Delete image?"
     description: "Description"
     remove?: "Really delete content block?"
-    deleting: Deleting...
-    saving: Saving...
+    deleting: ' Deleting...'
+    saving: ' Saving...'
     title:
       image: Image
       video: Video

data/config/locales/redditor.ru.yml

@@ -11,8 +11,8 @@ ru:
     delete_image: "Удалить изображение?"
     description: "Описание"
     remove?: "Вы, действительно, хотите удалить контент-блок?"
-    deleting: Удаление...
-    saving: Сохранение...
+    deleting: ' Удаление...'
+    saving: ' Сохранение...'
     title:
       image: Изображение
       video: Видео

data/lib/redditor/version.rb

@@ -1,3 +1,3 @@
 module Redditor
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end

data/spec/features/text_spec.rb

@@ -13,8 +13,8 @@ describe "Text block" do
   def visit_article() visit "/admin/articles/#{article.id}/edit"; end
   def add_block() find_link(I18n.t("redditor.add.text_block")).click; end
   def submit() find_button("Submit").click; end
-  def save_block() find_link("✔").click; end
-  def delete_block() find_link("✘").click; end
+  def save_block() find("a.redditor__update").click; end
+  def delete_block() find("a.redditor__delete").click; end
 
   it "Saves text block to article", type: :feature, js: true do
     add_block
@@ -26,12 +26,13 @@ describe "Text block" do
   it "Shows validation error if text block content is empty", type: :feature, js: true do
     add_block
     submit
-    expect(page.find(".errors")).to have_content "can't be blank"
+    expect(page).to have_content "can't be blank"
   end
 
   it "Deletes text block", type: :feature, js: true do
     article.page.text_blocks.build(body: "123", position: 1).save
     visit_article
+    save_page
     delete_block
     visit_article
     text_value = begin

data/spec/features/video_spec.rb

@@ -13,8 +13,8 @@ describe "Video block" do
   def visit_article() visit "/admin/articles/#{article.id}/edit"; end
   def add_block() find_link(I18n.t("redditor.add.video_block")).click; end
   def submit() find_button("Submit").click; end
-  def save_block() find_link("✔").click; end
-  def delete_block() find_link("✘").click; end
+  def save_block() find("a.redditor__update").click; end
+  def delete_block() find("a.redditor__delete").click; end
 
   it "Saves video block to article", type: :feature, js: true do
     add_block

data/spec/spec_helper.rb

@@ -15,7 +15,7 @@ require 'capybara/rspec'
 require 'capybara/poltergeist'
 
 Capybara.javascript_driver = :poltergeist
-Capybara.default_wait_time = 10
+# Capybara.default_wait_time = 10
 
 # Requires supporting ruby files with custom matchers and macros, etc,
 # in spec/support/ and its subdirectories.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redditor
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Oleg Bovykin
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-21 00:00:00.000000000 Z
+date: 2013-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -251,20 +251,11 @@ files:
 - app/assets/images/redditor/move_handler.png
 - app/assets/images/redditor/no_format_text.png
 - app/assets/images/redditor/trash.png
-- app/assets/javascripts/fileapi/FileAPI.exif.js
-- app/assets/javascripts/fileapi/FileAPI.flash.image.swf
-- app/assets/javascripts/fileapi/FileAPI.flash.swf
-- app/assets/javascripts/fileapi/FileAPI.id3.js
-- app/assets/javascripts/fileapi/FileAPI.min.js
-- app/assets/javascripts/fileapi/fileapi.js.coffee.erb
-- app/assets/javascripts/fileapi/tmpl.js
 - app/assets/javascripts/fileapi/uploader.coffee
 - app/assets/javascripts/jquery-ui.min.js
 - app/assets/javascripts/redditor/application.js
 - app/assets/javascripts/redditor/redditor.coffee
 - app/assets/stylesheets/redditor/application.css.scss
-- app/assets/stylesheets/redditor/fileapi/fileapi.css.scss
-- app/assets/stylesheets/redditor/fileapi/fileapi_front.css.scss
 - app/assets/stylesheets/redditor/redditor.css.scss
 - app/controllers/redditor/admin/base_controller.rb
 - app/controllers/redditor/admin/image_blocks_controller.rb
@@ -286,7 +277,6 @@ files:
 - app/uploaders/redditor_uploader.rb
 - app/views/layouts/redditor/application.html.erb
 - app/views/redditor/admin/pages/_content_block.haml
-- app/views/redditor/admin/pages/_fileapi.erb
 - app/views/redditor/admin/pages/_image.haml
 - app/views/redditor/admin/pages/_page.haml
 - app/views/redditor/admin/pages/_slider_block.haml

data/app/assets/javascripts/fileapi/FileAPI.exif.js

@@ -1,59 +0,0 @@
-(function (){
-/**!
- * Binary Ajax 0.1.10
- * Copyright (c) 2008 Jacob Seidelin, cupboy@gmail.com, http://blog.nihilogic.dk/
- * Licensed under the MPL License [http://www.nihilogic.dk/licenses/mpl-license.txt]
- *
- *
- * Javascript EXIF Reader 0.1.4
- * Copyright (c) 2008 Jacob Seidelin, cupboy@gmail.com, http://blog.nihilogic.dk/
- * Licensed under the MPL License [http://www.nihilogic.dk/licenses/mpl-license.txt]
- */
-
-
-var BinaryFile=function(j,k,l){var h=j,i=k||0,b=0;this.getRawData=function(){return h};"string"==typeof j&&(b=l||h.length,this.getByteAt=function(a){return h.charCodeAt(a+i)&255},this.getBytesAt=function(a,b){for(var c=[],f=0;f<b;f++)c[f]=h.charCodeAt(a+f+i)&255;return c});this.getLength=function(){return b};this.getSByteAt=function(a){a=this.getByteAt(a);return 127<a?a-256:a};this.getShortAt=function(a,b){var c=b?(this.getByteAt(a)<<8)+this.getByteAt(a+1):(this.getByteAt(a+1)<<8)+this.getByteAt(a);
-0>c&&(c+=65536);return c};this.getSShortAt=function(a,b){var c=this.getShortAt(a,b);return 32767<c?c-65536:c};this.getLongAt=function(a,b){var c=this.getByteAt(a),f=this.getByteAt(a+1),e=this.getByteAt(a+2),g=this.getByteAt(a+3),c=b?(((c<<8)+f<<8)+e<<8)+g:(((g<<8)+e<<8)+f<<8)+c;0>c&&(c+=4294967296);return c};this.getSLongAt=function(a,b){var c=this.getLongAt(a,b);return 2147483647<c?c-4294967296:c};this.getStringAt=function(a,b){for(var c=[],f=this.getBytesAt(a,b),e=0;e<b;e++)c[e]=String.fromCharCode(f[e]);
-return c.join("")};this.getCharAt=function(a){return String.fromCharCode(this.getByteAt(a))};this.toBase64=function(){return window.btoa(h)};this.fromBase64=function(a){h=window.atob(a)}},EXIF={};
-(function(){function j(b){if(255!=b.getByteAt(0)||216!=b.getByteAt(1))return!1;for(var a=2,d=b.getLength();a<d;){if(255!=b.getByteAt(a))return i&&console.log("Not a valid marker at offset "+a+", found: "+b.getByteAt(a)),!1;var c=b.getByteAt(a+1);if(22400==c||225==c)return i&&console.log("Found 0xFFE1 marker"),h(b,a+4,b.getShortAt(a+2,!0)-2);a+=2+b.getShortAt(a+2,!0)}}function k(b,a,d,c,f){for(var e=b.getShortAt(d,f),g={},h=0;h<e;h++){var j=d+12*h+2,k=c[b.getShortAt(j,f)];!k&&i&&console.log("Unknown tag: "+
-b.getShortAt(j,f));g[k]=l(b,j,a,d,f)}return g}function l(b,a,d,c,f){var e=b.getShortAt(a+2,f),c=b.getLongAt(a+4,f),d=b.getLongAt(a+8,f)+d;switch(e){case 1:case 7:if(1==c)return b.getByteAt(a+8,f);d=4<c?d:a+8;a=[];for(e=0;e<c;e++)a[e]=b.getByteAt(d+e);return a;case 2:return b.getStringAt(4<c?d:a+8,c-1);case 3:if(1==c)return b.getShortAt(a+8,f);d=2<c?d:a+8;a=[];for(e=0;e<c;e++)a[e]=b.getShortAt(d+2*e,f);return a;case 4:if(1==c)return b.getLongAt(a+8,f);a=[];for(e=0;e<c;e++)a[e]=b.getLongAt(d+4*e,f);
-return a;case 5:if(1==c)return b.getLongAt(d,f)/b.getLongAt(d+4,f);a=[];for(e=0;e<c;e++)a[e]=b.getLongAt(d+8*e,f)/b.getLongAt(d+4+8*e,f);return a;case 9:if(1==c)return b.getSLongAt(a+8,f);a=[];for(e=0;e<c;e++)a[e]=b.getSLongAt(d+4*e,f);return a;case 10:if(1==c)return b.getSLongAt(d,f)/b.getSLongAt(d+4,f);a=[];for(e=0;e<c;e++)a[e]=b.getSLongAt(d+8*e,f)/b.getSLongAt(d+4+8*e,f);return a}}function h(b,a){if("Exif"!=b.getStringAt(a,4))return i&&console.log("Not valid EXIF data! "+b.getStringAt(a,4)),!1;
-var d,c=a+6;if(18761==b.getShortAt(c))d=!1;else if(19789==b.getShortAt(c))d=!0;else return i&&console.log("Not valid TIFF data! (no 0x4949 or 0x4D4D)"),!1;if(42!=b.getShortAt(c+2,d))return i&&console.log("Not valid TIFF data! (no 0x002A)"),!1;if(8!=b.getLongAt(c+4,d))return i&&console.log("Not valid TIFF data! (First offset not 8)",b.getShortAt(c+4,d)),!1;var f=k(b,c,c+8,EXIF.TiffTags,d);if(f.ExifIFDPointer){var e=k(b,c,c+f.ExifIFDPointer,EXIF.Tags,d),g;for(g in e){switch(g){case "LightSource":case "Flash":case "MeteringMode":case "ExposureProgram":case "SensingMethod":case "SceneCaptureType":case "SceneType":case "CustomRendered":case "WhiteBalance":case "GainControl":case "Contrast":case "Saturation":case "Sharpness":case "SubjectDistanceRange":case "FileSource":e[g]=
-EXIF.StringValues[g][e[g]];break;case "ExifVersion":case "FlashpixVersion":e[g]=String.fromCharCode(e[g][0],e[g][1],e[g][2],e[g][3]);break;case "ComponentsConfiguration":e[g]=EXIF.StringValues.Components[e[g][0]]+EXIF.StringValues.Components[e[g][1]]+EXIF.StringValues.Components[e[g][2]]+EXIF.StringValues.Components[e[g][3]]}f[g]=e[g]}}if(f.GPSInfoIFDPointer)for(g in d=k(b,c,c+f.GPSInfoIFDPointer,EXIF.GPSTags,d),d){switch(g){case "GPSVersionID":d[g]=d[g][0]+"."+d[g][1]+"."+d[g][2]+"."+d[g][3]}f[g]=
-d[g]}return f}var i=!1;EXIF.Tags={36864:"ExifVersion",40960:"FlashpixVersion",40961:"ColorSpace",40962:"PixelXDimension",40963:"PixelYDimension",37121:"ComponentsConfiguration",37122:"CompressedBitsPerPixel",37500:"MakerNote",37510:"UserComment",40964:"RelatedSoundFile",36867:"DateTimeOriginal",36868:"DateTimeDigitized",37520:"SubsecTime",37521:"SubsecTimeOriginal",37522:"SubsecTimeDigitized",33434:"ExposureTime",33437:"FNumber",34850:"ExposureProgram",34852:"SpectralSensitivity",34855:"ISOSpeedRatings",
-34856:"OECF",37377:"ShutterSpeedValue",37378:"ApertureValue",37379:"BrightnessValue",37380:"ExposureBias",37381:"MaxApertureValue",37382:"SubjectDistance",37383:"MeteringMode",37384:"LightSource",37385:"Flash",37396:"SubjectArea",37386:"FocalLength",41483:"FlashEnergy",41484:"SpatialFrequencyResponse",41486:"FocalPlaneXResolution",41487:"FocalPlaneYResolution",41488:"FocalPlaneResolutionUnit",41492:"SubjectLocation",41493:"ExposureIndex",41495:"SensingMethod",41728:"FileSource",41729:"SceneType",
-41730:"CFAPattern",41985:"CustomRendered",41986:"ExposureMode",41987:"WhiteBalance",41988:"DigitalZoomRation",41989:"FocalLengthIn35mmFilm",41990:"SceneCaptureType",41991:"GainControl",41992:"Contrast",41993:"Saturation",41994:"Sharpness",41995:"DeviceSettingDescription",41996:"SubjectDistanceRange",40965:"InteroperabilityIFDPointer",42016:"ImageUniqueID"};EXIF.TiffTags={256:"ImageWidth",257:"ImageHeight",34665:"ExifIFDPointer",34853:"GPSInfoIFDPointer",40965:"InteroperabilityIFDPointer",258:"BitsPerSample",
-259:"Compression",262:"PhotometricInterpretation",274:"Orientation",277:"SamplesPerPixel",284:"PlanarConfiguration",530:"YCbCrSubSampling",531:"YCbCrPositioning",282:"XResolution",283:"YResolution",296:"ResolutionUnit",273:"StripOffsets",278:"RowsPerStrip",279:"StripByteCounts",513:"JPEGInterchangeFormat",514:"JPEGInterchangeFormatLength",301:"TransferFunction",318:"WhitePoint",319:"PrimaryChromaticities",529:"YCbCrCoefficients",532:"ReferenceBlackWhite",306:"DateTime",270:"ImageDescription",271:"Make",
-272:"Model",305:"Software",315:"Artist",33432:"Copyright"};EXIF.GPSTags={"0":"GPSVersionID",1:"GPSLatitudeRef",2:"GPSLatitude",3:"GPSLongitudeRef",4:"GPSLongitude",5:"GPSAltitudeRef",6:"GPSAltitude",7:"GPSTimeStamp",8:"GPSSatellites",9:"GPSStatus",10:"GPSMeasureMode",11:"GPSDOP",12:"GPSSpeedRef",13:"GPSSpeed",14:"GPSTrackRef",15:"GPSTrack",16:"GPSImgDirectionRef",17:"GPSImgDirection",18:"GPSMapDatum",19:"GPSDestLatitudeRef",20:"GPSDestLatitude",21:"GPSDestLongitudeRef",22:"GPSDestLongitude",23:"GPSDestBearingRef",
-24:"GPSDestBearing",25:"GPSDestDistanceRef",26:"GPSDestDistance",27:"GPSProcessingMethod",28:"GPSAreaInformation",29:"GPSDateStamp",30:"GPSDifferential"};EXIF.StringValues={ExposureProgram:{"0":"Not defined",1:"Manual",2:"Normal program",3:"Aperture priority",4:"Shutter priority",5:"Creative program",6:"Action program",7:"Portrait mode",8:"Landscape mode"},MeteringMode:{"0":"Unknown",1:"Average",2:"CenterWeightedAverage",3:"Spot",4:"MultiSpot",5:"Pattern",6:"Partial",255:"Other"},LightSource:{"0":"Unknown",
-1:"Daylight",2:"Fluorescent",3:"Tungsten (incandescent light)",4:"Flash",9:"Fine weather",10:"Cloudy weather",11:"Shade",12:"Daylight fluorescent (D 5700 - 7100K)",13:"Day white fluorescent (N 4600 - 5400K)",14:"Cool white fluorescent (W 3900 - 4500K)",15:"White fluorescent (WW 3200 - 3700K)",17:"Standard light A",18:"Standard light B",19:"Standard light C",20:"D55",21:"D65",22:"D75",23:"D50",24:"ISO studio tungsten",255:"Other"},Flash:{"0":"Flash did not fire",1:"Flash fired",5:"Strobe return light not detected",
-7:"Strobe return light detected",9:"Flash fired, compulsory flash mode",13:"Flash fired, compulsory flash mode, return light not detected",15:"Flash fired, compulsory flash mode, return light detected",16:"Flash did not fire, compulsory flash mode",24:"Flash did not fire, auto mode",25:"Flash fired, auto mode",29:"Flash fired, auto mode, return light not detected",31:"Flash fired, auto mode, return light detected",32:"No flash function",65:"Flash fired, red-eye reduction mode",69:"Flash fired, red-eye reduction mode, return light not detected",
-71:"Flash fired, red-eye reduction mode, return light detected",73:"Flash fired, compulsory flash mode, red-eye reduction mode",77:"Flash fired, compulsory flash mode, red-eye reduction mode, return light not detected",79:"Flash fired, compulsory flash mode, red-eye reduction mode, return light detected",89:"Flash fired, auto mode, red-eye reduction mode",93:"Flash fired, auto mode, return light not detected, red-eye reduction mode",95:"Flash fired, auto mode, return light detected, red-eye reduction mode"},
-SensingMethod:{1:"Not defined",2:"One-chip color area sensor",3:"Two-chip color area sensor",4:"Three-chip color area sensor",5:"Color sequential area sensor",7:"Trilinear sensor",8:"Color sequential linear sensor"},SceneCaptureType:{"0":"Standard",1:"Landscape",2:"Portrait",3:"Night scene"},SceneType:{1:"Directly photographed"},CustomRendered:{"0":"Normal process",1:"Custom process"},WhiteBalance:{"0":"Auto white balance",1:"Manual white balance"},GainControl:{"0":"None",1:"Low gain up",2:"High gain up",
-3:"Low gain down",4:"High gain down"},Contrast:{"0":"Normal",1:"Soft",2:"Hard"},Saturation:{"0":"Normal",1:"Low saturation",2:"High saturation"},Sharpness:{"0":"Normal",1:"Soft",2:"Hard"},SubjectDistanceRange:{"0":"Unknown",1:"Macro",2:"Close view",3:"Distant view"},FileSource:{3:"DSC"},Components:{"0":"",1:"Y",2:"Cb",3:"Cr",4:"R",5:"G",6:"B"}};EXIF.getData=function(b,a){if(!b.complete)return!1;b.exifdata?a&&a():BinaryAjax(b.src,function(d){d=j(d.binaryResponse);b.exifdata=d||{};a&&a()});return!0};
-EXIF.getTag=function(b,a){if(b.exifdata)return b.exifdata[a]};EXIF.getAllTags=function(b){if(!b.exifdata)return{};var b=b.exifdata,a={},d;for(d in b)b.hasOwnProperty(d)&&(a[d]=b[d]);return a};EXIF.pretty=function(b){if(!b.exifdata)return"";var b=b.exifdata,a="",d;for(d in b)b.hasOwnProperty(d)&&(a="object"==typeof b[d]?a+(d+" : ["+b[d].length+" values]\r\n"):a+(d+" : "+b[d]+"\r\n"));return a};EXIF.readFromBinaryFile=function(b){return j(b)}})();
-
-
-FileAPI.support.exif = true;
-
-
-FileAPI.addInfoReader(/^image/, function (file/**File*/, callback/**Function*/){
-	if( !file.__exif ){
-		var defer = file.__exif = FileAPI.defer();
-
-		FileAPI.readAsBinaryString(file, function (evt){
-			if( evt.type == 'load' ){
-				var binaryString = evt.result;
-				var oFile = new BinaryFile(binaryString, 0, file.size);
-				var exif  = EXIF.readFromBinaryFile(oFile);
-
-				defer.resolve(false, { 'exif': exif || {} });
-			}
-			else if( evt.type == 'error' ){
-				defer.resolve('read_as_binary_string_exif');
-			}
-		});
-	}
-
-	file.__exif.then(callback);
-});
-})();