New version 3.0.1. Read more http://xdsoft.net/jodit/#3.0.1

xdan · Aug 1, 2017 · 6f6da66 · 6f6da66
1 parent a4bde51
commit 6f6da66
Show file tree

Hide file tree

Showing 36 changed files with 91 additions and 150 deletions.
diff --git a/README.md b/README.md
@@ -5,25 +5,38 @@ An excellent WYSIWYG editor written in pure TypeScript without the use of additi
 
 ## For contributors:
 ```$xslt
-yarn install
+npm install
 ```
 
 Run webpack Hot Reload server:
 ```$xslt
-yarn start
+npm start
 ```
 
 Build min files:
 ```$xslt
-yarn run build
+npm run build
 ```
 
-For check tests, open in browser:
+Run tests:
+```$xslt
+karma start --browsers ChromeHeadless,IE,Firefox karma.conf.js
+```
+or
+```$xslt
+npm test
+```
+or
+```$xslt
+yarn test
+```
+
+For checking tests in browser, open URL:
 ```$xslt
 http://localhost:2000/test/test.html
 ```
 
-For testing FileBrowser and Uploader need install [PHP Connector](https://github.com/xdan/jodit-connectors)
+For testing FileBrowser and Uploader modules, need install [PHP Connector](https://github.com/xdan/jodit-connectors)
 ```
 composer create-project jodit/connector
 ```
@@ -59,6 +72,13 @@ After this, you can init Jodit plugin
 new Jodit('#editor');
 ```
 
+With jQuery
+```javascript
+$('textarea').each(function (elm) {
+    new Jodit(elm);
+});
+```
+
 ## Browser Support
 ______________________
 * Internet Explorer 9
@@ -69,6 +89,9 @@ ______________________
 
 
 ## Changelog
+### 3.0.2
+ * Now `options`.`language` by default equal `auto`. It means that after init Jodit, it try define page language (`<html lang="de">`), if it is impossible, editor define language by browser.language.
+ * Added `options`.`debugLanguage`=`false` if true, editro ignore `options`.`language` and `editor.i18n(key)` return `'{key}'`  
 ### 3.0.1
-Restore inline toolbar for Images and Tables
+ * Restore inline toolbar for Images and Tables
 
diff --git a/dist/jodit.css b/dist/jodit.css
diff --git a/dist/jodit.js b/dist/jodit.js
diff --git a/package.json b/package.json
@@ -1,14 +1,14 @@
 {
   "name": "jodit",
-  "version": "3.0.1",
+  "version": "3.0.2",
   "description": "Jodit is awesome and usefully wysiwyg editor with filebrowser",
   "main": "index.js",
   "scripts": {
+    "newversion": "npm version patch --no-git-tag-version && npm run build && git add --all  && git commit -m \"New version %npm_package_version%. Read more http://xdsoft.net/jodit/#%npm_package_version% \" && git tag %npm_package_version% && git push --tags gitlab HEAD:master",
     "gitlab": "git add --all && git commit -m 'Commit' && git push -u origin master",
     "start": "node server.js",
     "build": "rm -f dist/* && cross-env NODE_ENV=production webpack --progress",
-    "test": "karma start --browsers ChromeHeadless,IE,Firefox karma.conf.js",
-    "test:static": "mocha-phantomjs test/test.html "
+    "test": "karma start --browsers ChromeHeadless,IE,Firefox karma.conf.js"
   },
   "repository": {
     "type": "git",
@@ -25,7 +25,7 @@
   "bugs": {
     "url": "https://github.com/xdan/jodit/issues"
   },
-  "homepage": "https://github.com/xdan/jodit#readme",
+  "homepage": "http://xdsoft.net/jodit/",
   "devDependencies": {
     "@types/node": "^7.0.39",
     "autoprefixer": "^6.7.7",
@@ -38,7 +38,6 @@
     "express": "^4.15.3",
     "extract-text-webpack-plugin": "^2.1.2",
     "file-loader": "^0.10.1",
-    "jquery": "^3.1.1",
     "karma": "^1.7.0",
     "karma-chai": "^0.1.0",
     "karma-chrome-launcher": "^2.2.0",

diff --git a/src/Jodit.ts b/src/Jodit.ts
@@ -10,13 +10,18 @@ import FileBrowser from "./modules/FileBrowser";
 import Uploader from "./modules/Uploader";
 import {Config} from "./Config";
 
+declare let appVersion: string;
+
 interface JoditPlugin{
     destruct?: Function;
     open?: Function;
 }
 
 /** Class Jodit. Main class*/
 export default class Jodit extends Component{
+    version: string = appVersion;
+
+
     static defaultOptions: Config;
     static plugins: any =  {};
     static modules: any =  {};
@@ -632,7 +637,7 @@ export default class Jodit extends Component{
      * @return {string}
      */
     getVersion = () => {
-        return '3.0.1';
+        return this.version;
     }
 }
 

diff --git a/src/index.ts b/src/index.ts
@@ -28,11 +28,7 @@ requireAll(require.context('./styles/plugins/', true, /\.less$/));
 const context = require.context('./styles/icons/', true, /\.svg$/);
 
 context.keys().forEach(function (key) {
-    Toolbar.icons[key.replace('.svg', '').replace('./', '')] = context.apply(this, arguments)
-        .replace(/(version|id)="[^"]+"/gm, '')
-        .replace(/xmlns="http:\/\/www.w3.org\/2000\/svg"/gm, '')
-        .replace(/xmlns:xlink="http:\/\/www.w3.org\/1999\/xlink"/gm, '')
-        .replace(/<!--.*-->/gm, '');
+    Toolbar.icons[key.replace('.svg', '').replace('./', '')] = context.apply(this, arguments);
 });
 
 const context2 = require.context('./modules/', true, /\.ts/);

diff --git a/src/modules/FileBrowser.ts b/src/modules/FileBrowser.ts
@@ -320,8 +320,6 @@ export type FileBrowserCallBcackData = {
 };
 
 declare module "../Config" {
-
-
     interface Config {
         filebrowser: FileBrowserOptions
     }

diff --git a/src/styles/icons/about.svg b/src/styles/icons/about.svg
diff --git a/src/styles/icons/addcolumn.svg b/src/styles/icons/addcolumn.svg
diff --git a/src/styles/icons/addrow.svg b/src/styles/icons/addrow.svg
diff --git a/src/styles/icons/angle-left.svg b/src/styles/icons/angle-left.svg
diff --git a/src/styles/icons/angle-right.svg b/src/styles/icons/angle-right.svg
diff --git a/src/styles/icons/arrows-alt.svg b/src/styles/icons/arrows-alt.svg
diff --git a/src/styles/icons/arrows-h.svg b/src/styles/icons/arrows-h.svg
diff --git a/src/styles/icons/attachment.svg b/src/styles/icons/attachment.svg
diff --git a/src/styles/icons/bin.svg b/src/styles/icons/bin.svg
diff --git a/src/styles/icons/bold.svg b/src/styles/icons/bold.svg
diff --git a/src/styles/icons/brush.svg b/src/styles/icons/brush.svg
diff --git a/src/styles/icons/cancel.svg b/src/styles/icons/cancel.svg
diff --git a/src/styles/icons/center.svg b/src/styles/icons/center.svg
diff --git a/src/styles/icons/chain-broken.svg b/src/styles/icons/chain-broken.svg
diff --git a/src/styles/icons/check-square.svg b/src/styles/icons/check-square.svg