push_type_admin 0.8.1 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 583d892f22139a2671bb984f20dba5a011d86653
-  data.tar.gz: 3a7c598d26c83857cea7633a079e915a2474f7f0
+  metadata.gz: 7c45588a5fa922b89b76dad850c14c8818818918
+  data.tar.gz: 06a16d7bb9b474d3e8bcf7edf571e318d07a2f9c
 SHA512:
-  metadata.gz: f322f211376650e78497f5bfaf430f0ffae73dbec938768bb32a52f1d3cf4350f2401b0adc80d3825bd326b5db0ffce5e02b31ba12d6ddf9c421c9f5413da689
-  data.tar.gz: ecd2115b8dd594dab25ac34af1b50b38935acb516308bdae88679959ca7c06d8afa9b659331d95dc5c9a27570db81dee579dd4f55fe5f1956714a3e67e956db2
+  metadata.gz: 37f55b4e84b5dbf6aefde6a5e16b8b94a3ef18c22b06a7eb7f92348f003e89386354eb8ab13c63ff5a67d44fb41e909fd9a24f1bdef9c5a37ed2ca6f076dec49
+  data.tar.gz: 27b6e2f33f608bae8f99306a65f2d7c024edc8785124668ce1a1f9d693cfd870d5e3758c4470363930ae328c2f8f6cf23ac5fefb9ba89bb13b034d18881298d4

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

@@ -32,14 +32,7 @@ Turbolinks.enableProgressBar()
 
 Math.uid = -> Math.floor(Math.random()*16777215).toString(16)
 
-# By default doc is not binded
-docBinded = false
 # Document should by bound first and only then should
 # dynamically added dom nodes be bound
 $(document).on 'init.fndtn', (e) ->
-  if e.target == document
-    $(document).foundation()
-    $(document).confirmWithReveal()
-    docBinded = true 
-  else if docBinded
-    $(e.target).foundation()
+  $(e.target).foundation()

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

@@ -108,16 +108,22 @@
 
 	// jQuery dependencies
 
+	// Set this variable on the window object
+	// use it to tell if foundation has been init
+	window.fndtnInit = false;
+
 	var app = {
 	  el: '[role="main"]',
 	  ready: function ready() {
 	    setTimeout(function () {
-	      return (0, _expose$ExposeJQueryJquery2.default)(document).trigger('init.fndtn');
-	    }, 100);
+	      (0, _expose$ExposeJQueryJquery2.default)(document).trigger('init.fndtn');
+	      window.fndtnInit = true;
+	    }, 250);
 	  }
 	};
 
 	(0, _expose$ExposeJQueryJquery2.default)(document).on('ready page:load', function () {
+	  window.fndtnInit = false;
 	  new _exposeVueVue2.default(app);
 
 	  (0, _expose$ExposeJQueryJquery2.default)('.node-list.sortable').sortable({
@@ -48095,9 +48101,11 @@
 	  ready: function ready() {
 	    var _this = this;
 
-	    setTimeout(function () {
-	      return $(_this.$el).trigger('init.fndtn');
-	    }, 100);
+	    if (window.fndtnInit) {
+	      setTimeout(function () {
+	        return $(_this.$el).trigger('init.fndtn');
+	      }, 100);
+	    }
 	  },
 
 	  computed: {
@@ -48314,9 +48322,11 @@
 	  ready: function ready() {
 	    var _this = this;
 
-	    setTimeout(function () {
-	      return $(_this.$el).trigger('init.fndtn');
-	    }, 100);
+	    if (window.fndtnInit) {
+	      setTimeout(function () {
+	        return $(_this.$el).trigger('init.fndtn');
+	      }, 100);
+	    }
 	  },
 
 	  methods: {

data/app/webpack/javascripts/admin.es6

@@ -29,14 +29,22 @@ import './filters/kb.es6';
 import 'html5sortable';
 import 'jquery-sticky';
 
+// Set this variable on the window object
+// use it to tell if foundation has been init
+window.fndtnInit = false;
+
 const app = {
   el: '[role="main"]',
   ready: function() {
-    setTimeout(() => $(document).trigger('init.fndtn'), 100);
+    setTimeout(() => {
+      $(document).trigger('init.fndtn');
+      window.fndtnInit = true;
+    }, 250);
   }
 }
 
 $(document).on('ready page:load', function() {
+  window.fndtnInit = false;
   new Vue(app);
 
   $('.node-list.sortable').sortable({

data/app/webpack/javascripts/components/asset-field.es6

@@ -16,7 +16,9 @@ export default Vue.component('asset-field', {
   },
 
   ready: function() {
-    setTimeout(() => $(this.$el).trigger('init.fndtn'), 100);
+    if (window.fndtnInit) {
+      setTimeout(() => $(this.$el).trigger('init.fndtn'), 100);
+    }
   },
 
   computed: {

data/app/webpack/javascripts/components/wysiwyg-field.es6

@@ -11,7 +11,9 @@ export default Vue.component('wysiwyg-field', {
   },
 
   ready: function() {
-    setTimeout(() => $(this.$el).trigger('init.fndtn'), 100);
+    if (window.fndtnInit) {
+      setTimeout(() => $(this.$el).trigger('init.fndtn'), 100);
+    }
   },
 
   methods: {

data/test/dummy/app/models/page.rb

@@ -6,9 +6,6 @@ class Page < PushType::Node
   has_child_nodes :all
 
   # Model the content by adding custom fields to the node.
-  field :body_1, :wysiwyg, toolbar: 'full'
-  field :body_2, :wysiwyg, toolbar: 'mini'
-  field :body_3, :wysiwyg
-  field :body_4, :wysiwyg, toolbar: 'text'
+  # field :body, :text, validates: { presence: true }
 
 end

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 = '3aa5b3636d906fa2e364118f7262cce02bd693e93234e2b5f9dd863627e29146'
+  # config.dragonfly_secret = '2c894e6d33cb14f356b389711f12e9f254aad3f32f10536d9ad2b48a975230ba'
 
 end

data/test/dummy/config/secrets.yml

@@ -11,10 +11,10 @@
 # if you're sharing your code publicly.
 
 development:
-  secret_key_base: 115ea307735b32a2a70c7440dc55324e6d28f6664b3fd373b12325b65a08cede64a65d11803b0ca86a4efbf3009c0e324b5217f013fb5fe93855a82afeb859e4
+  secret_key_base: 1028676f02e3d5e0cfff99d8a597ba4605a421e12984acd5178a79389481cd100233cb5e369f537c2662c69f2da104f95dcab6f386d51e1a0f219a1c71ede23f
 
 test:
-  secret_key_base: 0df7fbd4db793d0a985f7eb31336d17b9519938d90c5b92505bd96dcd4bc4bb6cd3276b3b211abc2088c3882a0a862821f8f76919ac6b5044705676022ff624f
+  secret_key_base: 3fb798fa5dc6a3badd207a6857dd8a27546506955f3532d2fefd124e7d238d1ae54521fc35dce11014bde7f680203e5b204034b3f6b97b4fb2cfb478812d903c
 
 # Do not keep production secrets in the repository,
 # instead read values from the environment.

data/test/dummy/db/schema.rb

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