push_type_admin 0.9.0.beta.3 → 0.9.0.beta.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cecc4e1a1a0b028fbf2e0c34dbf73b21dd70511d
-  data.tar.gz: b2b2b6933bf1669c4976a01de5c492c8f9435317
+  metadata.gz: 85e6f0d7fdbe9ebcfe2e6b88bd543a94ef7ba15e
+  data.tar.gz: 223613093133910a56653c587ccdcee10911a3f1
 SHA512:
-  metadata.gz: e566a5929fb4208352bb9d81f375e5e312a0dcffb1f8cb92f681280193af2e95dc8126465bd7e051644eb3a95d841d36c0256a7988d512cff9fe4869a4ceda1d
-  data.tar.gz: 40ac7457251dbdc1c2a75f4d9c36c5b183cde2ba58d3b7521d5dce22e9b30ba2b0246e1b43ca481349cbcc54fa8522bece1ee9523c0448ab7746ac7c8853527a
+  metadata.gz: 5a0056cef0e97b6ba2b2fdda5ab130aa4586b9425b671de4cfacf5e581fe955c79bc6b054bfe6b28b46bd5df1fa93b6ae5223628cef427d3b07031ddcd5d2bee
+  data.tar.gz: 9bebac8201a3a8078780a2f815d9a0d0c6aa95e3140bd6c204e74c7316fbb2e321cbdc06b8fe79b3d8b8ad7bfe4f5caef33d08b5181588593919ed4084b83b8f

data/app/assets/javascripts/push_type/admin.js.coffee

@@ -22,6 +22,8 @@
 #= require pickadate/picker
 #= require pickadate/picker.date
 #= require pickadate/picker.time
+#= require codemirror
+#= require codemirror/modes/xml
 #= require froala_editor.min
 #= require ./wysiwyg_setup
 #= require ./vue_setup
@@ -34,3 +36,4 @@ Math.uid = -> Math.floor(Math.random()*16777215).toString(16)
 # dynamically added dom nodes be bound
 $(document).on 'init.fndtn', (e) ->
   $(e.target).foundation()
+  $(e.target).confirmWithReveal() if $(e.target).find('[data-confirm]').length

data/app/assets/javascripts/push_type/webpack/admin.bundle.js

@@ -48648,7 +48648,6 @@
 	    blockquote: 'Quote',
 	    pre: 'Code'
 	  },
-	  codeBeautifier: true,
 	  codeMirror: true,
 	  height: 400,
 	  theme: 'gray'
@@ -48690,7 +48689,7 @@
 	      return alert(error.message);
 	    });
 
-	    var options = _lodash2.default.cloneDeep(defaults);
+	    var options = {};
 	    _lodash2.default.extend(options, defaults, opts[this.params.froalaToolbar], {
 	      imageUploadURL: this.params.uploadPath
 	    });

data/app/assets/javascripts/push_type/wysiwyg_setup.js.erb

@@ -19,6 +19,8 @@ $.extend($.FroalaEditor.DEFAULTS, {
   linkEditButtons: ['linkOpen', 'linkStyle', 'linkEdit', 'linkRemove'],
 });
 
+$.FroalaEditor.DEFAULTS['codeMirrorOptions']['theme'] = 'material';
+
 _.remove($.FroalaEditor.DEFAULTS['imageEditButtons'],   function(b) { return b === 'imageStyle' });
 _.remove($.FroalaEditor.DEFAULTS['linkEditButtons'],    function(b) { return b === 'linkStyle' });
 _.remove($.FroalaEditor.DEFAULTS['linkInsertButtons'],  function(b) { return b === 'linkList' });

data/app/assets/stylesheets/push_type/admin.scss

@@ -14,6 +14,8 @@
  *= require pickadate/classic
  *= require pickadate/classic.date
  *= require pickadate/classic.time
+ *= require codemirror
+ *= require codemirror/themes/material
  *= require froala_editor.min
  *= require froala_style.min
  *= require plugins/code_view.min

data/app/webpack/javascripts/directives/froala.es6

@@ -15,7 +15,6 @@ const defaults = {
     blockquote: 'Quote',
     pre: 'Code'
   },
-  codeBeautifier: true,
   codeMirror: true,
   height: 400,
   theme: 'gray'
@@ -47,7 +46,7 @@ export default Vue.directive('froala', {
     $el.on('froalaEditor.blur',         (e, editor) => editor.$box.removeClass('focus') );
     $el.on('froalaEditor.image.error',  (e, editor, error) => alert(error.message) );
 
-    let options = _.cloneDeep(defaults);
+    let options = {};
     _.extend(options, defaults, opts[this.params.froalaToolbar], {
       imageUploadURL: this.params.uploadPath
     })

data/lib/push_type/admin.rb

@@ -8,6 +8,7 @@ require 'foundation-icons-sass-rails'
 require 'jquery-rails'
 require 'pickadate-rails'
 require 'selectize-rails'
+require 'codemirror-rails'
 require 'wysiwyg-rails'
 require 'font-awesome-rails'
 require 'turbolinks'

data/test/dummy/config/initializers/push_type.rb

@@ -45,6 +45,6 @@ PushType.setup do |config|
   #   secret_access_key:  ENV['SECRET_ACCESS_KEY_ID']
   # }
 
-  # config.dragonfly_secret = '544de0c8d68d6cb77cbb31790253e5417ed86ad13fc6c820c40350dc33d7f8b6'
+  # config.dragonfly_secret = '96700d9f13f5f7ae07c3ce289633cb461dc149b80ff6203ab84785ccc33b5299'
 
 end

data/test/dummy/config/secrets.yml

@@ -11,10 +11,10 @@
 # if you're sharing your code publicly.
 
 development:
-  secret_key_base: 2c70a92f5ba347f2eee228c4e3f2a16c47442af14df88f530335559e41ed2bdc535124e473b25c6954d3ea25738904ebac5db7a2d88e776819f9bc5827d9540d
+  secret_key_base: a453400379e431e8bd5bad185e18ce7b117a56b047327a58639a6069f3e93f4a8d8e5cbf767a7593e9049a1d1a486eaed0c3cd5d205579d3ec3d7768e3dd7a71
 
 test:
-  secret_key_base: ded3bb435818f91e597f55c706212c98c660a4329803beb66a87252d1aaff1e189c6d224fb99955ea0842a69da6bfdabcc16babe04c5fbfebe7ed4864bef238e
+  secret_key_base: 441e493ca8a0a9324e19558db611c0a84c216560451c89684dd9086fc551032d8480dc0f5699eeb54568a8af946c7bc7a7e1a175ef1cac58a3e144cd934fd4b5
 
 # Do not keep production secrets in the repository,
 # instead read values from the environment.

data/test/dummy/db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20160727140436) do
+ActiveRecord::Schema.define(version: 20160728152249) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"