trusty-clipped-extension 1.0.6 → 1.0.7

data/app/assets/javascripts/admin/assets_admin.js

@@ -0,0 +1,16 @@
+// This is a manifest file that'll be compiled into admin.js, which will include all the files
+// listed below.
+//
+// Any JavaScript/Coffee file within this directory, lib/assets/javascripts, vendor/assets/javascripts,
+// or vendor/assets/javascripts of plugins, if any, can be referenced here using a relative path.
+//
+// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
+// the compiled file.
+//
+// WARNING: THE FIRST BLANK LINE MARKS THE END OF WHAT'S TO BE PROCESSED, ANY BLANK LINE SHOULD
+// GO AFTER THE REQUIRES BELOW.
+//
+//= require jquery.ui.widget
+//= require jquery.iframe-transport
+//= require jquery.fileupload
+//= require assets

data/app/views/admin/assets/index.html.haml

@@ -1,5 +1,5 @@
 = stylesheet_link_tag 'admin/assets'
-= javascript_include_tag 'admin/assets'
+= javascript_include_tag 'admin/assets_admin'
 
 - content_for :toolbar do
   = render 'search'

data/app/views/admin/pages/_assets.html.haml

@@ -1,8 +1,5 @@
 = stylesheet_link_tag 'admin/assets'
-= javascript_include_tag 'admin/jquery.ui.widget'
-= javascript_include_tag 'admin/jquery.iframe-transport'
-= javascript_include_tag 'admin/jquery.fileupload'
-= javascript_include_tag 'admin/assets'
+= javascript_include_tag 'admin/assets_admin'
 
 #attachment_list.assets
   %ul#attachment_fields{:class => @page.page_attachments.empty? ? 'empty' : ''}

data/app/views/admin/removed/_assets_container.html.haml

@@ -1,7 +1,5 @@
 - @stylesheets << 'admin/assets'
-= javascript_include_tag 'ZeroClipboard'
-= javascript_include_tag 'admin/assets'
-= javascript_include_tag 'admin/dragdrop'
+= javascript_include_tag 'admin/assets_admin'
 
 #assets-container
   #asset-tabs
@@ -23,7 +21,6 @@
         - asset_tabs.bucket_tab do
           %a.asset-tab.here{ :href => "#" }
             = t("clipped_extension.bucket")
-      
     - if @page && !@page.new_record? 
       - render_region :asset_panes do |asset_panes|
 
@@ -43,7 +40,6 @@
                 != t("clipped_extension.asset_page_upload_note")
             = render :partial => "admin/assets/upload_to_page"
             .clear
-          
         - asset_panes.search do
           #search-assets.pane
             - form_tag do

data/lib/clipped/engine.rb

@@ -7,5 +7,10 @@ require 'will_paginate/array'
 module Clipped
   class Engine < Rails::Engine
     paths["app/helpers"] = []
+
+    initializer "trusty_cms.assets.precompile" do |app|
+      app.config.assets.precompile += %w(admin/assets.css assets_admin.js)
+    end
+
   end
 end

data/lib/trusty-clipped-extension.rb

@@ -1,5 +1,5 @@
 module TrustyCmsClippedExtension
-  VERSION     = "1.0.6"
+  VERSION     = "1.0.7"
   SUMMARY     = %q{Assets for TrustyCms CMS}
   DESCRIPTION = %q{Asset-management derived from Keith Bingman's Paperclipped extension.}
   URL         = "https://github.com/pgharts/trusty-clipped-extension"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: trusty-clipped-extension
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-23 00:00:00.000000000 Z
+date: 2014-12-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: acts_as_list
@@ -140,10 +140,10 @@ files:
 - app/assets/images/admin/xml_icon.png
 - app/assets/images/admin/zip_icon.png
 - app/assets/javascripts/admin/assets.js
+- app/assets/javascripts/admin/assets_admin.js
 - app/assets/javascripts/admin/jquery.fileupload.js
 - app/assets/javascripts/admin/jquery.iframe-transport.js
 - app/assets/javascripts/admin/jquery.ui.widget.js
-- app/assets/javascripts/admin/prototype_assets.js
 - app/assets/stylesheets/admin/assets.sass
 - app/assets/stylesheets/application.scss
 - app/controllers/admin/assets_controller.rb

data/app/assets/javascripts/admin/prototype_assets.js

@@ -1,166 +0,0 @@
-var Asset = {};
-
-Asset.Upload = Behavior.create({
-  onsubmit: function (e) {
-    if (e) e.stop();
-    var uuid = Asset.GenerateUUID();
-    var ulframe = document.createElement('iframe');
-    ulframe.setAttribute('name', uuid);   // this doesn't work on ie7: will need bodging
-    $('upload_holders').insert(ulframe);
-
-    var form = this.element;
-    var title = form.down('input.textbox').value || form.down('input.file').value;
-    var placeholder = Asset.AddPlaceholder(title);
-
-    form.setAttribute('target', uuid);
-    ulframe.observe('load', function (e) {
-      if (e) e.stop();
-      var response = ulframe.contentDocument.body.innerHTML;
-      if (response && response != "") {
-        placeholder.remove();
-        Asset.AddToList(response);
-        ulframe.remove();
-      }
-    });
-
-    form.submit();
-    $('upload_asset').closePopup();
-
-    // Small delay is required here to let safari assemble the payload
-    // form.down('input').clear().defer();
-    // form.down('input.file').clear().defer();
-  }
-});
-
-
-// this local attachment method works and is much quicker, but it's fragile and doesn't notice Trusty configuration changes
-// better to bounce off the server, provided it can be made responsive enough.
-
-// Asset.Attach = Behavior.create({
-//   onclick: function (e) {
-//     if (e) e.stop();
-//     var container = this.element.up('li.asset');
-//     container.addClassName('waiting');
-//     var title = container.down('div.title').innerHTML;
-//     var image = container.down('img');
-//     var uuid = Asset.GenerateUUID();
-//     var asset_id = this.element.getAttribute('rel').split('_').last();
-//     var attachment_field = document.createElement('input');
-//     attachment_field.setAttribute('type', 'hidden');
-//     attachment_field.setAttribute('id', 'page_page_attachments_attributes_' + uuid + '_asset_id');
-//     attachment_field.setAttribute('name', 'page[page_attachments_attributes][' + uuid + '][asset_id]');
-//     attachment_field.value = asset_id;
-//     var placeholder = Asset.AddPlaceholder(title, image, attachment_field);
-//     container.removeClassName('waiting');
-//     placeholder.removeClassName('waiting');
-//   }
-// });
-
-
-
-
-
-
-Asset.Sortable = Behavior.create({
-  initialize: function (e) {
-    this.sorter = Asset.MakeSortable(this.element);
-  }
-});
-
-// Asset-filter and search functions are available wherever the asset_table partial is displayed
-
-Asset.SearchForm = Behavior.create({
-  initialize: function () {
-    this.observer = new Form.Element.Observer(this.element.down('input.search'), 2, Asset.UpdateTable);
-  },
-  onsubmit: function (e) {
-    if (e) e.stop();
-    Asset.UpdateTable(true);
-  }
-});
-
-Asset.MakeSortable = function (element) {
-  var sorter = Sortable.create(element, {
-    overlap: 'horizontal',
-    constraint: false,
-    handle: 'back',
-    onChange: function (e) {
-      Asset.SetPositions();
-      Asset.Notify('Assets reordered. Save page to commit changes.');
-    }
-  });
-  element.addClassName('sortable');
-  Asset.SetPositions();
-  return sorter;
-}
-
-Asset.SetPositions = function () {
-  $('attachment_fields').select('input.pos').each(function (input, index) {
-    input.value = index;
-  });
-}
-
-// originally taken from phpMyAdmin
-Asset.InsertAtCursor = function(field, insertion) {
-  if (document.selection) {  // ie
-    field.focus();
-    var sel = document.selection.createRange();
-    sel.text = insertion;
-  }
-  else if (field.selectionStart || field.selectionStart == '0') {  // moz
-    var startPos = field.selectionStart;
-    var endPos = field.selectionEnd;
-    field.value = field.value.substring(0, startPos) + insertion + field.value.substring(endPos, field.value.length);
-    field.selectionStart = field.selectionEnd = startPos + insertion.length;
-  } else {
-    field.value += value;
-  }
-}
-
-Asset.GenerateUUID = function () {
-  // http://www.ietf.org/rfc/rfc4122.txt
-  var s = [];
-  var hexDigits = "0123456789ABCDEF";
-  for (var i = 0; i < 32; i++) { s[i] = hexDigits.substr(Math.floor(Math.random() * 0x10), 1); }
-  s[12] = "4";                                       // bits 12-15 of the time_hi_and_version field to 0010
-  s[16] = hexDigits.substr((s[16] & 0x3) | 0x8, 1);  // bits 6-7 of the clock_seq_hi_and_reserved to 01
-  return s.join('');
-};
-
-Asset.AddPlaceholder = function (title, image, contents) {
-  var placeholder = document.createElement('li').addClassName('asset').addClassName('waiting');
-  if (contents) placeholder.insert(contents);
-  var front = document.createElement('div').addClassName('front');
-  if (image) front.insert(document.createElement('div').addClassName('thumbnail').insert(image.clone()));
-  placeholder.insert(front);
-  if (!title) title = 'please wait';
-  var back = document.createElement('div').addClassName('back').insert(document.createElement('div').addClassName('title').update(title));
-  placeholder.insert(back);
-  $('attachment_fields').insert(placeholder);
-  Asset.ShowListIfHidden();
-  return placeholder;
-}
-
-Asset.AllWaiting = function (container) {
-  if (!container) container = $('assets_table');
-  container.select('li.asset').each(function (el) { el.addClassName('waiting'); });
-}
-
-
-
-Asset.HideListIfEmpty = function () {
-  var list = $('attachment_fields');
-  if (!list.down('li.asset:not(.detached)')) {
-    list.addClassName('empty');
-    // list.slideUp();
-    Asset.Notify('All assets detached. Save page to commit changes');
-  } else {
-    Asset.Notify('Assets detached. Save page to commit changes');
-  }
-}
-
-Event.addBehavior({
-  'ul#attachment_fields': Asset.Sortable,
-  'form.upload_asset': Asset.Upload,
-  'a.insert_asset': Asset.Insert
-});