fuel 0.3.33 → 0.3.34

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 913f9a70707dc21cc9cb45eaec8ee9edaa38c0ce
-  data.tar.gz: e8627ef01220178d59c402ce83642c94d1b6a0d2
+  metadata.gz: f44b806e44773aaef00d1ed770577bedeffce5ca
+  data.tar.gz: 9a25014011ec7c17cfbc6f96ec322d509948f308
 SHA512:
-  metadata.gz: 6f6edb2fec8c7a49e1d5b73244fdfce3766cc5de73b65c186c0737b314f8284b3502cea9358981346ad37ae91acaa118efe84dd007199161423729a1ef5fd51d
-  data.tar.gz: fdfcdc167e33faf002db452d183477c39e753b519fa3ecebb8da6bbd684f5b22d9cf322a93368809cbc1143db375b6a11f7f4bc43a1be59f59f869b6159df873
+  metadata.gz: 3a66b012d71eb03806bf08db3801125ad987f9d528facb27c169d0bbfc7fbee29dd4cf0fdadad478b67f83a5b4ee849c1e4f6f95cd8386311fc98610a794c9ea
+  data.tar.gz: b1485b5dd9e31278595c5f60a9137d0e58c5c0cb3c998f8d3134fd24ea0bc69d0ee580c324ae3e254e79d4eeff9fffeae5c5462d2b6ffac52441497030c87ca2

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

@@ -11,6 +11,7 @@
 // about supported directives.
 //
 //= require jquery
+//= require jquery_ujs
 //= require fuel/admin
 //= require fuel/facebook
 //= require fuel/sliding-panel

data/app/views/fuel/admin/posts/_editor.html.erb

@@ -2,32 +2,33 @@
   $(function() {
     $body = $("body");
 
+    var editorId = "fuel_post_content";
+    var editorStylesheetPath = "<%= stylesheet_path('fuel/wysihtml') %>";
+    var editorSubmitUrl = '<%= s3_direct_post.url %>';
+    var editorFormData = JSON.parse('<%= s3_direct_post.fields.to_json.html_safe %>');
+    var editorHostUrl = '//<%= @s3_direct_post.url.host %>/';
+
     if ($("body").hasClass("posts-controller")){
-       var editor = new wysihtml5.Editor("fuel_post_content", { // id of textarea element
-          toolbar:      "editor", // id of toolbar element
-          parserRules:  wysihtml5ParserRules,
-          stylesheets: "<%= stylesheet_path('fuel/wysihtml') %>"
-       });
+      var editor = new wysihtml5.Editor(editorId, { // id of textarea element
+        toolbar:      "editor", // id of toolbar element
+        parserRules:  wysihtml5ParserRules,
+        stylesheets: editorStylesheetPath
+      });
 
       <% if s3_direct_post %>
       $('.directUpload').each(function(i, elem) {
         var fileInput    = $(elem);
-        // var form         = $(fileInput.parents('form:first'));
         var submitButton = $(".save-button");
         var progressBar  = $("<div class='bar'></div>");
         var barContainer = $("<div class='progress'></div>").append(progressBar);
-        // var submitUrl = fileInput.data("url");
-        // var formData = fileInput.data("formData");
-        var submitUrl = '<%= s3_direct_post.url %>';
-        var formData = JSON.parse('<%= s3_direct_post.fields.to_json.html_safe %>');
 
         fileInput.after(barContainer);
         fileInput.fileupload({
           fileInput:       fileInput,
-          url:             submitUrl,
+          url:             editorSubmitUrl,
           type:            'POST',
           autoUpload:       true,
-          formData:         formData,
+          formData:         editorFormData,
           paramName:        'file', // S3 does not like nested name fields i.e. name="user[avatar_url]"
           dataType:         'XML',  // S3 returns XML if success_action_status is set to 201
           replaceFileInput: false,
@@ -50,7 +51,7 @@
             // extract key and generate URL from response
             var key   = $(data.jqXHR.responseXML).find("Key").text();
 
-            var newUrl   = '//<%= @s3_direct_post.url.host %>/' + key;
+            var newUrl   = editorHostUrl + key;
             console.log(newUrl);
 
             // set url in form

data/app/views/layouts/fuel/application.html.erb

@@ -15,8 +15,9 @@
     <main role="main" aria-label="main-content" class="<%= controller_name -%> <%= action_name -%> navbar-offset">
       <%= yield %>
     </main>
+
     <%= javascript_include_tag "fuel/application" %>
-    <%= javascript_include_tag "application" %>
+    <%# javascript_include_tag "application" %>
 
     <%= render 'fuel/admin/posts/editor' %>
 

data/lib/fuel/version.rb

@@ -1,3 +1,3 @@
 module Fuel
-  VERSION = "0.3.33"
+  VERSION = "0.3.34"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fuel
 version: !ruby/object:Gem::Version
-  version: 0.3.33
+  version: 0.3.34
 platform: ruby
 authors:
 - Ryan Francis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-20 00:00:00.000000000 Z
+date: 2015-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails