update table classes list

Author: movie4

.stylelintrc

@@ -1,18 +1,50 @@
 {
   "extends": "stylelint-config-standard",
+  "plugins": [
+    "stylelint-order"
+    ],
   "rules": {
+    "order/properties-order": [
+      "width",
+      "height",
+      "min-width",
+      "min-height",
+      "max-width",
+      "max-height",
+      "font",
+      "color",
+      "text-shadow",
+      "text-decoration",
+      "text-transform",
+      "text-align",
+      "white-space",
+      "background",
+      "padding",
+      "margin",
+      "border",
+      "border-radius",
+      "position",
+      "display",
+      "content",
+      "left",
+      "top",
+      "right",
+      "bottom",
+      "vertical-align"
+    ],
     "no-descending-specificity": null,
     "shorthand-property-no-redundant-values": null,
-    "at-rule-empty-line-before": ["never", {
+    "at-rule-empty-line-before": [
+      "never",
       except: [
         "blockless-after-same-name-blockless",
-        "blockless-after-blockless",
+        "blockless-after-blockless"
       ],
       ignore: [
         "after-comment",
         "blockless-after-blockless"
       ]
-    }],
+    ],
     "function-url-quotes": "always",
     "max-nesting-depth": 10,
     "string-quotes": "single",

CHANGELOG.rst

@@ -7,6 +7,7 @@ Changelog
 0.0.22
 ------
 * Add table class list
+* Update tinymce4 to 4.7.12
 
 0.0.21
 ------

LICENSE.rst

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2016 ITCase
+Copyright (c) 2018 ITCase
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "django-tinymce-4",
-  "version": "0.0.21",
+  "version": "0.0.22",
   "homepage": "https://github.com/ITCase-django/django-tinymce-4",
   "authors": [
     "ITCase <[email protected]>"
@@ -15,6 +15,6 @@
     "tests"
   ],
   "dependencies": {
-    "tinymce": "~4.7.9"
+    "tinymce": "~4.7.12"
   }
 }

gulpfile.js

@@ -4,6 +4,8 @@ const gulp = require('gulp')
 const plugins = require('gulp-load-plugins')({ pattern: ['gulp-*', 'gulp.*'] })
 
 const argv = require('yargs').argv
+const chalk = require('chalk')
+const log = require('fancy-log')
 const map = require('vinyl-map')
 
 const TARGET_CSS = '__tinymce-4.css'
@@ -58,9 +60,10 @@ gulp.task('css', () => {
   return gulp.src(CSS_FILES)
     .pipe(plugins.plumber({
       errorHandler: (err) => {
-        plugins.util.log(
-          plugins.util.colors.red('gulp-css:'),
-          plugins.util.colors.yellow(err.message))
+        log(
+          chalk.red('gulp-css:'),
+          chalk.yellow(err.message),
+          chalk.yellow(err))
       }
     }))
     .pipe(plugins.sourcemaps.init())
@@ -89,8 +92,7 @@ gulp.task('css', () => {
     .pipe(gulp.dest(TARGET_CSS_PATH))
     .pipe(plugins.filter('**/*.css'))
     .pipe(map((code, filename) => {
-      plugins.util.log('CSS: ' +
-      plugins.util.colors.green(filename))
+      log('CSS: ' + chalk.green(filename))
     }))
 })
 

package.json

@@ -2,7 +2,7 @@
   "name": "django-tinymce-4",
   "title": "Integrate TinyMCE4 in Django projects",
   "description": "",
-  "version": "0.0.21",
+  "version": "0.0.22",
   "homepage": "http://www.github.com/ITCase-django/django-tinymce-4/",
   "author": "ITCase <[email protected]> (http://www.itcase.pro/)",
   "repository": {
@@ -15,10 +15,12 @@
   },
   "devDependencies": {
     "autoprefixer": "^8.1.0",
+    "chalk": "^2.4.1",
     "eslint": "^4.18.2",
     "eslint-config-standard": "^11.0.0",
     "eslint-plugin-promise": "^3.7.0",
     "eslint-plugin-standard": "^3.0.1",
+    "fancy-log": "^1.3.2",
     "gulp": "^4.0.0",
     "gulp-batch": "~1.0.5",
     "gulp-concat": "^2.6.1",
@@ -31,7 +33,6 @@
     "gulp-plumber": "^1.2.0",
     "gulp-postcss": "^7.0.1",
     "gulp-sourcemaps": "^2.6.4",
-    "gulp-util": "^3.0.8",
     "gulp-watch": "^5.0.0",
     "postcss-calc": "^6.0.1",
     "postcss-color-function": "^4.0.1",
@@ -44,6 +45,7 @@
     "postcss-reporter": "^5.0.0",
     "stylelint": "^9.1.3",
     "stylelint-config-standard": "^18.2.0",
+    "stylelint-order": "^0.8.1",
     "vinyl-map": "^1.0.2",
     "yargs": "^11.0.0"
   },

tinymce_4/__init__.py

@@ -1,3 +1,3 @@
 # -*- coding: utf-8 -*-
 
-__version__ = '0.0.21'
+__version__ = '0.0.22'

tinymce_4/static/tinymce_4/settings/full.js

@@ -20,6 +20,9 @@ if (typeof tinySettings === 'object') {
   if (typeof languageUrl === 'string') {
     tinySettings.language_url = languageUrl
   }
+  if (typeof tableClassList === 'object') {
+    tinySettings.table_class_list = imageClassList;
+  }
   if (typeof styleFormats === 'object') {
     tinySettings.style_formats = styleFormats.concat(customStyleFormats);
   }

tinymce_4/static/tinymce_4/settings/full/table_class_list.js

@@ -1,8 +1,5 @@
-var imageClassList = [
+var tableClassList = [
   {
     title: 'None', value: ''
-  }, {
-    title: 'Open in modal window',
-    value: 'image_action_open-popup'
   }
 ]

tinymce_4/static/tinymce_4/tinymce/.bower.json

@@ -18,14 +18,14 @@
     ".npmignore",
     "changelog.txt"
   ],
-  "version": "4.7.9",
-  "_release": "4.7.9",
+  "version": "4.7.12",
+  "_release": "4.7.12",
   "_resolution": {
     "type": "version",
-    "tag": "4.7.9",
-    "commit": "3edc2e2b270fb38e85db083b717ab57a092f77ab"
+    "tag": "4.7.12",
+    "commit": "914887eeeb9a28034045879defa09defccf7c68a"
   },
   "_source": "https://github.com/tinymce/tinymce-dist.git",
-  "_target": "~4.7.9",
+  "_target": "~4.7.12",
   "_originalSource": "tinymce"
 }