push_type_admin 0.9.1 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9a9faf1faf2dd459e0b18e8e5e9eeda68c100698
-  data.tar.gz: fc27e74adbda40992ddc5bdd31685d58448848ef
+  metadata.gz: 5f76d34eb1c86d812216610a8bdf0c3b92680286
+  data.tar.gz: 7a3ae2b951f40228918b93e73adb75b8fdad1a6c
 SHA512:
-  metadata.gz: 5cf26b6c0bfe1f75e6ac715b8703904dd46443abf3f632818e9f58a3a6ae706a50e552380c176516b1dddb2de1be2757db6d3406356776ce49c4a402c718bf16
-  data.tar.gz: d52179944d58cc4bb02f6dfd658713dd3188895aa5bc9f91eb396d448540512fa0f27addeb560c910f1325b62fa7c15646c603558caa500f6d8ff7b604e22525
+  metadata.gz: 32952155ea63e3d194b19ed775ef5095b1c1366229e7a785a1428db55387938f4388c0fc511ae2132b86818b73d313efbcfca404bf576d5853bf4d959c1fd437
+  data.tar.gz: 39d161d62149b8f310123e1031e13587ba1ab869b66ffaf70465e6b586a52dc77bc2cba7f681d016ed203df4d0b820e2502bdb9e370c45a269cc1fdedee39339

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

@@ -23,7 +23,11 @@
 #= require pickadate/picker.date
 #= require pickadate/picker.time
 #= require codemirror
+#= require codemirror/addons/mode/overlay.js
+#= require codemirror/addons/edit/continuelist.js
 #= require codemirror/modes/xml
+#= require codemirror/modes/markdown
+#= require codemirror/modes/gfm
 #= require froala_editor.min
 #= require ./wysiwyg_setup
 #= require ./vue_setup
@@ -37,3 +41,4 @@ Math.uid = -> Math.floor(Math.random()*16777215).toString(16)
 $(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

@@ -92,10 +92,12 @@
 
 	__webpack_require__(149);
 
-	__webpack_require__(151);
+	__webpack_require__(150);
 
 	__webpack_require__(152);
 
+	__webpack_require__(153);
+
 	function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 	_exposeVueVue2.default.use(_vueResource2.default);
@@ -48655,7 +48657,8 @@
 
 	var opts = {
 	  full: {
-	    // default
+	    toolbarButtons: ['bold', 'italic', 'underline', '|', 'paragraphFormat', 'align', 'formatOL', 'formatUL', 'insertTable', '|', 'insertLink', 'insertImage', 'insertVideo', 'insertFile', '|', 'undo', 'redo', 'clearFormatting', 'fullscreen', '|', 'html'],
+	    toolbarButtonsMD: ['bold', 'italic', 'underline', '|', 'paragraphFormat', 'align', 'formatOL', 'formatUL', 'insertTable', '|', 'insertLink', '|', 'undo', 'redo', 'clearFormatting', '|', 'html']
 	  },
 	  text: {
 	    toolbarButtons: ['bold', 'italic', 'underline', '|', 'paragraphFormat', 'align', 'formatOL', 'formatUL', 'insertTable', '|', 'insertLink', '|', 'undo', 'redo', 'clearFormatting', '|', 'html'],
@@ -48714,6 +48717,46 @@
 
 	var _vue2 = _interopRequireDefault(_vue);
 
+	function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+	var opts = {
+	  'markdown': {
+	    mode: 'gfm',
+	    lineNumbers: false,
+	    matchBrackets: true,
+	    lineWrapping: true,
+	    theme: 'base16-light',
+	    extraKeys: {
+	      'Enter': 'newlineAndIndentContinueMarkdownList'
+	    }
+	  }
+	};
+
+	exports.default = _vue2.default.directive('code-mirror', {
+	  params: ['code-mirror-mode'],
+	  bind: function bind() {
+	    var _this = this;
+
+	    setTimeout(function () {
+	      CodeMirror.fromTextArea(_this.el, opts[_this.params.codeMirrorMode]);
+	    }, 50);
+	  }
+	});
+
+/***/ },
+/* 149 */
+/***/ function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	Object.defineProperty(exports, "__esModule", {
+	  value: true
+	});
+
+	var _vue = __webpack_require__(8);
+
+	var _vue2 = _interopRequireDefault(_vue);
+
 	var _jquery = __webpack_require__(6);
 
 	var _jquery2 = _interopRequireDefault(_jquery);
@@ -48739,7 +48782,7 @@
 	});
 
 /***/ },
-/* 149 */
+/* 150 */
 /***/ function(module, exports, __webpack_require__) {
 
 	'use strict';
@@ -48752,7 +48795,7 @@
 
 	var _vue2 = _interopRequireDefault(_vue);
 
-	var _numeral = __webpack_require__(150);
+	var _numeral = __webpack_require__(151);
 
 	var _numeral2 = _interopRequireDefault(_numeral);
 
@@ -48763,7 +48806,7 @@
 	});
 
 /***/ },
-/* 150 */
+/* 151 */
 /***/ function(module, exports, __webpack_require__) {
 
 	var __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;/*!
@@ -49448,7 +49491,7 @@
 
 
 /***/ },
-/* 151 */
+/* 152 */
 /***/ function(module, exports, __webpack_require__) {
 
 	var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;;(function(root, factory) {
@@ -49883,7 +49926,7 @@
 
 
 /***/ },
-/* 152 */
+/* 153 */
 /***/ function(module, exports, __webpack_require__) {
 
 	var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;// Sticky Plugin v1.0.3 for jQuery

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

@@ -15,6 +15,7 @@
  *= require pickadate/classic.date
  *= require pickadate/classic.time
  *= require codemirror
+ *= require codemirror/themes/base16-light
  *= require codemirror/themes/material
  *= require froala_editor.min
  *= require froala_style.min
@@ -994,6 +995,7 @@ form .asset-upload {
   box-shadow:           $input-box-shadow !important;
 
   .focus & {
+    background:         $input-focus-bg-color !important;
     border-color:       $input-focus-border-color !important;
   }
 }
@@ -1008,4 +1010,18 @@ form .asset-upload {
   font-weight: 400;
 }
 
+.CodeMirror {
+  margin-bottom: rem-calc(16);
+  height: 400px;
+  font-family: $font-family-monospace;
+  background: $input-bg-color !important;
+  border: 1px solid $input-border-color;
+  box-shadow: $input-box-shadow;
+
+  &.CodeMirror-focused {
+    background: $input-focus-bg-color !important;
+    border-color: $input-focus-border-color;
+  }
+}
+
 @import "foundation-icons";

data/app/webpack/javascripts/admin.es6

@@ -20,6 +20,7 @@ import './directives/asset-upload.es6';
 import './directives/pickadate.es6';
 import './directives/selectize.es6';
 import './directives/froala.es6';
+import './directives/code-mirror.es6';
 import './directives/simple-pagination.es6';
 
 // Filters

data/app/webpack/javascripts/directives/code-mirror.es6

@@ -0,0 +1,21 @@
+import Vue from 'vue';
+
+const opts = {
+  'markdown': {
+    mode:           'gfm',
+    lineNumbers:    false,
+    matchBrackets:  true,
+    lineWrapping:   true,
+    theme:          'base16-light',
+    extraKeys: {
+      'Enter': 'newlineAndIndentContinueMarkdownList'
+    }
+  }
+}
+
+export default Vue.directive('code-mirror', {
+  params: ['code-mirror-mode'],
+  bind: function() {
+    setTimeout(() => { CodeMirror.fromTextArea(this.el, opts[this.params.codeMirrorMode]) }, 50)
+  }
+})

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

@@ -22,7 +22,8 @@ const defaults = {
 
 const opts = {
   full: {
-    // default
+    toolbarButtons: ['bold', 'italic', 'underline', '|', 'paragraphFormat', 'align', 'formatOL', 'formatUL', 'insertTable', '|', 'insertLink', 'insertImage', 'insertVideo', 'insertFile', '|', 'undo', 'redo', 'clearFormatting', 'fullscreen', '|', 'html'],
+    toolbarButtonsMD: ['bold', 'italic', 'underline', '|', 'paragraphFormat', 'align', 'formatOL', 'formatUL', 'insertTable', '|', 'insertLink', '|', 'undo', 'redo', 'clearFormatting', '|', 'html'],
   },
   text: {
     toolbarButtons: ['bold', 'italic', 'underline', '|', 'paragraphFormat', 'align', 'formatOL', 'formatUL', 'insertTable', '|', 'insertLink', '|', 'undo', 'redo', 'clearFormatting', '|', 'html'],

data/config/initializers/haml.rb

@@ -0,0 +1 @@
+Haml::Template.options[:ugly] = true

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 = '617270e18782e066eac942dd9fcc0724ed5b3d06398ed93642da08b085ce2ba4'
+  # config.dragonfly_secret = '652782af5572b84e2f69be6b82fd0a6e822c2ffe51933428cddf11853de15a34'
 
 end

data/test/dummy/config/secrets.yml

@@ -11,10 +11,10 @@
 # if you're sharing your code publicly.
 
 development:
-  secret_key_base: a1f8f6cfe6235ddc4f8433a50dde1dcb020e5b9ca10145e86ee6f65d528a97560699de08dfd0b6ea08db81fbdb93c53d59fc67cdc75ef87adc3ffa6c0d4da341
+  secret_key_base: b8b257403284d0d91b1e54a0ff122b9cffa5c72d942e27ffc7fd998119e34e2c8cf529b83d89e70ae6ed6f041a277eb4b586da73aabd650ffa937623d19be1f1
 
 test:
-  secret_key_base: e514e92a0e4ffc223b34fb473400990a4e695a7303648ddbea4b3bbe734fa3d89e4b213ab89a70653ee9cc6ecfe481a7e57c112edfd22cbbe7f65bd9c53928ec
+  secret_key_base: a4896127f09bba2e463540cd5d4b6b6874218615487a026c5514e46163d1ed6f690595f3ec37d5cbbccd5fb08d01769ed2c6bb49c812299fd2ec642dec2f933f
 
 # 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: 20160802195944) do
+ActiveRecord::Schema.define(version: 20160808143043) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"