Skip to content

Commit

Permalink
Merge pull request summernote#1976 from summernote/develop
Browse files Browse the repository at this point in the history
v0.8.2
  • Loading branch information
hackerwins authored Aug 7, 2016
2 parents f74896d + 5042a63 commit 9a5e5ab
Show file tree
Hide file tree
Showing 173 changed files with 2,865 additions and 506 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,6 @@ coverage/

.idea/
*.iml

# NuGet
build/
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
language: node_js
sudo: false
node_js: 4.1
node_js: 5.1
before_script:
- node --version
- npm --version
Expand Down
49 changes: 0 additions & 49 deletions CONTRIBUTING.md

This file was deleted.

33 changes: 26 additions & 7 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,13 @@ module.exports = function (grunt) {
version: '8.0',
platform: 'windows XP'
},
*/
'SL_IE9': {
base: 'SauceLabs',
browserName: 'internet explorer',
version: '9.0',
platform: 'windows 7'
},
*/
'SL_IE10': {
base: 'SauceLabs',
browserName: 'internet explorer',
Expand All @@ -44,12 +44,14 @@ module.exports = function (grunt) {
version: '11.0',
platform: 'windows 8.1'
},
/*
'SL_EDGE': {
base: 'SauceLabs',
browserName: 'microsoftedge',
version: '20',
platform: 'windows 10'
},
*/
'SL_CHROME': {
base: 'SauceLabs',
browserName: 'chrome',
Expand Down Expand Up @@ -107,7 +109,7 @@ module.exports = function (grunt) {
},

jscs: {
src: ['*.js', 'src/**/*.js', 'test/**/*.js'],
src: ['*.js', 'src/**/*.js', 'test/**/*.js', 'plugin/**/*.js'],
gruntfile: 'Gruntfile.js',
build: 'build'
},
Expand All @@ -126,6 +128,13 @@ module.exports = function (grunt) {
src: '**/*.js',
dest: 'dist/lang',
ext: '.min.js'
},
{
expand: true,
cwd: 'dist/plugin',
src: '**/*.js',
dest: 'dist/plugin',
ext: '.min.js'
}
]
}
Expand All @@ -135,9 +144,18 @@ module.exports = function (grunt) {
recess: {
dist: {
options: { compile: true, compress: true },
files: {
'dist/summernote.css': ['src/less/summernote.less']
}
files: [
{
'dist/summernote.css': ['src/less/summernote.less']
},
{
expand: true,
cwd: 'dist/plugin',
src: '**/*.css',
dest: 'dist/plugin',
ext: '.min.css'
}
]
}
},

Expand All @@ -160,7 +178,7 @@ module.exports = function (grunt) {
'dist/font/*'
]
}, {
src: ['plugin/**/*.js', 'lang/**/*.js'],
src: ['plugin/**/*.js', 'plugin/**/*.css', 'lang/**/*.js'],
dest: 'dist/'
}]
}
Expand Down Expand Up @@ -245,6 +263,7 @@ module.exports = function (grunt) {
dist: {
files: [
{ src: 'lang/*', dest: 'dist/' },
{ src: 'plugin/**/*', dest: 'dist/' },
{ expand: true, cwd: 'src/icons/dist/font/', src: ['**', '!*.html'], dest: 'dist/font/' },
{ src: 'src/icons/dist/summernote.css', dest: 'src/icons/dist/summernote.less' }
]
Expand All @@ -269,7 +288,7 @@ module.exports = function (grunt) {
// load all grunts/*.js
grunt.loadTasks('grunts');

// server: runt server for development
// server: run server for development
grunt.registerTask('server', ['connect', 'watch']);

// lint
Expand Down
21 changes: 21 additions & 0 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
The MIT License (MIT)

Copyright (c) 2015~ Summernote Team (https://github.com/orgs/summernote/people)

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
3 changes: 2 additions & 1 deletion MAINTAIN.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,4 +40,5 @@ meteor/publish.sh
### 05. Update summernote.github.io
Update summernote version in _config.yml.

TODO...
### 06. Update connector
- [summernote-rails](https://github.com/summernote/summernote-rails/blob/master/MAINTAIN.md)
26 changes: 7 additions & 19 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,9 @@ Summernote uses opensource libraries: [jQuery](http://jquery.com/), [Bootstrap](

For [Meteor](http://github.com/meteor/meteor), just run `meteor add summernote:summernote`. More info in the [Meteor README](meteor/README.md).

Also there's an adaptation for React: [react-summernote](https://github.com/Vnkitaev/react-summernote)


For other/no frameworks:

#### 1. include JS/CSS
Expand All @@ -47,7 +50,7 @@ Include the following code in the `<head>` tag of your HTML:
<script src="summernote.js"></script>
```

#### 2. target elements
#### 2. target a element

Then place a `div` tag somewhere in the `body` tag. This element will be replaced with the summernote editor.

Expand All @@ -65,6 +68,8 @@ $(document).ready(function() {
});
```

For more examples, please visit to [homepage](http://summernote.org/examples).

### API

`code` - get the HTML source code underlying the text in the editor:
Expand All @@ -73,29 +78,12 @@ $(document).ready(function() {
var html = $('#summernote').summernote('code');
```

`Destroy` summernote:

```javascript
$('#summernote').summernote('destroy');
```
For more detail about API, please refer to [document](http://summernote.org/getting-started/#basic-api).

#### Warning - code injection

The code view allows the user to enter script contents. Make sure to filter/[sanitize the HTML on the server](https://github.com/search?l=JavaScript&q=sanitize+html). Otherwise, an attacker can inject arbitrary JavaScript code into clients.

### Supported platforms

Any modern browser: Safari, Chrome, Firefox, Opera, Internet Explorer 9+.

### Upcoming Features
* Responsive toolbar
* Table: Handles (sizing, selection) and popover
* IE8 Support
* Clipboard (you can paste images already)
* Media object selection

### Developer information

#### document structure

```
Expand Down
Binary file modified dist/font/summernote.eot
Binary file not shown.
Binary file modified dist/font/summernote.ttf
Binary file not shown.
Binary file modified dist/font/summernote.woff
Binary file not shown.
2 changes: 1 addition & 1 deletion dist/lang/summernote-ar-AR.js
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
},
style: {
style: 'تنسيق',
normal: 'عادي',
p: 'عادي',
blockquote: 'إقتباس',
pre: 'شفيرة',
h1: 'عنوان رئيسي 1',
Expand Down
4 changes: 2 additions & 2 deletions dist/lang/summernote-ar-AR.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/lang/summernote-bg-BG.js
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
},
style: {
style: 'Стил',
normal: 'Нормален',
p: 'Нормален',
blockquote: 'Цитат',
pre: 'Код',
h1: 'Заглавие 1',
Expand Down
4 changes: 2 additions & 2 deletions dist/lang/summernote-bg-BG.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions dist/lang/summernote-ca-ES.js
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
videoLink: 'Enllaç del vídeo',
insert: 'Inserir vídeo',
url: 'URL del vídeo?',
providers: '(YouTube, Vimeo, Vine, Instagram, DailyMotion, o Youku)'
providers: '(YouTube, Vimeo, Vine, Instagram, DailyMotion o Youku)'
},
link: {
link: 'Enllaç',
Expand All @@ -58,7 +58,7 @@
},
style: {
style: 'Estil',
normal: 'Normal',
p: 'p',
blockquote: 'Cita',
pre: 'Codi',
h1: 'Títol 1',
Expand Down Expand Up @@ -144,4 +144,4 @@
}
}
});
})(jQuery);
})(jQuery);
Loading

0 comments on commit 9a5e5ab

Please sign in to comment.