Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

upload image need file size limit property #518

Closed
wants to merge 158 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
158 commits
Select commit Hold shift + click to select a range
1824ad9
change to english doc
tingpan Jul 10, 2015
cf6a8c1
change wrong title
tingpan Jul 10, 2015
d5876b3
fix sentences
tingpan Jul 12, 2015
df69e95
Merge pull request #288 from mycolorway/df-toolbar-status
farthinker Jul 26, 2015
21536fd
CLOSE #260: alignment button supports td/th
farthinker Jul 26, 2015
5f8d70f
CLOSE #278: change root directory in release package
farthinker Jul 26, 2015
d6d2b00
CLOSE #283: allowedTags/allowedAttributes/allowedStyles options now a…
farthinker Jul 26, 2015
f713e20
CLOSE #282: use span[style] instead of font[color] in color button
farthinker Jul 26, 2015
fd63903
CLOSE #284
farthinker Jul 26, 2015
bdd0916
FIX: insert image in list could cause problem
farthinker Jul 28, 2015
a3cf12e
FIX: handle possible iframe tag while formatting
farthinker Jul 28, 2015
895eeea
CHG: README.md
farthinker Jul 28, 2015
0f0ab65
Merge branch 'master' into pt-doc-trans
farthinker Jul 28, 2015
a5c6ed3
CHG: modify docs
farthinker Jul 28, 2015
6f456fc
FIX: spec error
farthinker Jul 28, 2015
e5f625b
CHG: modify circle ci ruby version
farthinker Jul 28, 2015
f65e3d0
FIX: spec error
farthinker Jul 28, 2015
fa91421
Merge pull request #280 from mycolorway/pt-doc-trans
farthinker Jul 28, 2015
ef5b6ba
ADD: en-US language pack
farthinker Jul 28, 2015
94d88c4
publish v2.2.0
farthinker Jul 28, 2015
4e3654a
FIX: wrong title of extensions page
farthinker Jul 28, 2015
973a4be
fix containerNode
RuochenLyu Jul 31, 2015
f4fe48f
update version
RuochenLyu Jul 31, 2015
8372b7f
Merge pull request #290 from mycolorway/rc-fix-containerNode
farthinker Jul 31, 2015
42b1a43
FIX: trigger selectionchanged in valuechanged
farthinker Jul 31, 2015
2ccd2f0
CLOSE #292
farthinker Aug 3, 2015
d4d5415
CLOSE #291
farthinker Aug 3, 2015
6f8a596
FIX: undo bug
farthinker Aug 3, 2015
1131688
FIX: color button bug with collaped range
farthinker Aug 3, 2015
872590c
publish v2.2.3
farthinker Aug 3, 2015
6f6ff4f
FIX: spec error
farthinker Aug 5, 2015
2f5aa66
ADD: allow image button upload multiple files #293
farthinker Aug 7, 2015
5f21726
CHG: upload options in docs
farthinker Aug 14, 2015
d508023
FIX: popover remains visible after clicking code button in code block
farthinker Aug 22, 2015
a643abd
FIX: click blockquote button in blockquote won't cancel it
farthinker Aug 22, 2015
5fefa15
publish v2.2.4
farthinker Aug 22, 2015
6586dfc
FIX: closing issue #301
farthinker Aug 24, 2015
c58d358
recompile
farthinker Aug 24, 2015
3357702
FIX: set selection at end of body when focus
farthinker Aug 28, 2015
b20646f
FIX: click link button in list/blockquote/td && selectionchange bug
farthinker Aug 28, 2015
c75c213
FIX: paste bug in ms edge #322
farthinker Oct 6, 2015
cabbecb
CHG: refactor clipboard logic #322
farthinker Oct 7, 2015
c5209ea
FIX: #316
farthinker Oct 7, 2015
46e7cec
FIX: #314
farthinker Oct 8, 2015
fa8f885
ADD: test for indentation in code block
farthinker Oct 8, 2015
a887d9d
CHG: refactor inputManager and keystroke module
farthinker Oct 8, 2015
9701225
FIX: #326
farthinker Oct 8, 2015
299a405
publish v2.3.0
farthinker Oct 8, 2015
f971a43
FIX: paste long text bug
farthinker Oct 12, 2015
ac8c428
ADD: anchor link for events/methods docs
farthinker Oct 12, 2015
8db26b0
publish v2.3.1
farthinker Oct 12, 2015
7648c33
FIX: trigger selectionchanged after clicking alignment button #331
farthinker Oct 15, 2015
abbb5f4
FIX: h5 tag bug in title button #332
farthinker Oct 15, 2015
ab03833
CHG: toolbar item style && remove overflow on .simditor-wrapper
farthinker Oct 15, 2015
47e4665
publish v2.3.2
farthinker Oct 15, 2015
aeef2fa
Update README.md
farthinker Oct 16, 2015
efaf4aa
Update README.md
farthinker Oct 16, 2015
caface1
FIX: reset caret position before save caret position while pasting
farthinker Oct 19, 2015
b22daa1
FIX: Tab to focus in Firefox will lose correct caret position
farthinker Oct 19, 2015
e6991c8
FIX: uploadready event not triggered after upload success && spec errors
farthinker Oct 20, 2015
d55f082
publish v2.3.3
farthinker Oct 20, 2015
18584b0
ADD: fontScale button
tinyfive Oct 20, 2015
e20bc56
CHG: optimize fontScale button active status and style replace scope
tinyfive Oct 21, 2015
476fe6f
FIX: fontScale test error according to new simditor changes
tinyfive Oct 21, 2015
98d6083
FIX: font scale test copywrite
tinyfive Oct 22, 2015
67ac018
CHG: optimize font scale replace method
tinyfive Oct 22, 2015
b0c85f1
Merge pull request #343 from mycolorway/tf-font-scale
farthinker Oct 22, 2015
80b921e
FIX: undo bug
farthinker Oct 28, 2015
b1e07e3
publish v2.3.4
farthinker Oct 28, 2015
485c496
FIX: toolbar float bug #341
farthinker Nov 9, 2015
4d3510f
FIX: should no clear selection on blur
farthinker Nov 18, 2015
aa27d33
FIX: bug in undoManager._getNodeOffset()
farthinker Nov 18, 2015
5501be2
FIX: table must have a thead && block el inside td is not allowed
farthinker Nov 18, 2015
09f81d5
ADD: set link target in link button popover
farthinker Nov 18, 2015
5748c9b
ADD: inline code command for code button #325
farthinker Nov 18, 2015
ec26e74
publish v2.3.5
farthinker Nov 18, 2015
9b158f6
修改i18n中中文翻译错误
Dec 16, 2015
91647a8
Merge pull request #374 from kimufly/master
farthinker Dec 17, 2015
cc3b0be
CHG: npm update
farthinker Nov 26, 2015
cce8d1a
FIX: XSS bug using jquery html() #375
farthinker Dec 20, 2015
adfef21
FIX: wrong undoManager.currentCaret after selection change
farthinker Dec 21, 2015
31fcb8d
publish v2.3.6
farthinker Dec 21, 2015
1d7d792
ADD: option cleanPaste for pasting plain text #363 #366
farthinker Dec 21, 2015
ee40b6b
fix translate issue
belowfrog Jan 8, 2016
ba794f6
修改翻译错误
belowfrog Jan 8, 2016
7aade69
Merge pull request #393 from belowfrog/master
farthinker Jan 9, 2016
fa69b42
CHG: 为环境、依赖等添加版本信息
biallo Oct 24, 2017
29cbb81
FIX: webkit input[accept=image/*] 响应慢的问题
biallo Oct 24, 2017
cc02550
CHG: 移除编辑器链接默认 URL
biallo Oct 24, 2017
847b78c
CHG: handle URI like blob:https://tower.im/xx-xxx-xx in pasting
biallo Oct 24, 2017
df418e6
CHG: prevent simditor form being saved when there are unsaved image
biallo Oct 24, 2017
3392bdb
CHG: 解决搜狗浏览器修改文字颜色功能无效的问题
biallo Oct 24, 2017
2b0d7b4
CHG: 修改 umd.hbs
biallo Oct 24, 2017
67e9661
CHG: 编辑器没有 focus 时,也可以使用 toolbar
biallo Oct 25, 2017
33c1a5f
FIX: 修复文字大小功能在搜狗浏览器无法使用的问题
biallo Oct 25, 2017
2d41b97
Update
biallo Oct 25, 2017
16cffc9
FIX: 从粘贴内容中去除 style 标签
biallo Oct 25, 2017
bf926df
Update
biallo Oct 25, 2017
8ecff7d
FIX: 在编辑器 focus 的情况下切换浏览器 tab,再切回编辑器页面,直接点击「引用」、「缩进」等功能出错
biallo Nov 2, 2017
f584fba
CHG: 当设置 tabIndent 为 false 时,toolbar 的「缩进」按钮中不显示快捷键
biallo Nov 2, 2017
0d24ceb
rebuild
biallo Nov 2, 2017
8862f24
CHG: 修改版本号
biallo Nov 2, 2017
d65b79f
CHG: 避免被第三方插件影响样式
biallo Nov 2, 2017
0ca135d
rebuild
biallo Nov 2, 2017
6cc1255
CHG: 一些调整
biallo Nov 14, 2017
7537333
CHG: 去掉与编辑器本身逻辑无关的代码
biallo Nov 14, 2017
0075596
Merge pull request #507 from biallo/master
biallo Nov 15, 2017
de09ab0
CHG: 在 Chrome 63.0.3239.84 中,如果粘贴的内容没有 font-size 属性,会被默认设置为1px,从 span…
biallo Dec 11, 2017
c01f373
Update
biallo Dec 11, 2017
b9ce87c
Merge pull request #509 from mycolorway/biallo/fix-span-fontsize
biallo Dec 11, 2017
d10d0c9
FIX: 清理元素样式时,只针对单位为 px 的 font-size 属性进行数值判断
biallo Jan 8, 2018
5c4cd5c
Update README.md
RuochenLyu Jan 12, 2018
e2beff2
CHG: 在 H* 标题中,禁用 font-size 功能;以及相应的粘贴处理
biallo Jan 17, 2018
03bbe1d
FIX: 解决粘贴的 table col 宽度为 NaN% 的问题
biallo Jan 17, 2018
effbd35
Publish v2.3.10
biallo Jan 18, 2018
e6603ea
Merge branch 'master' of github.com:mycolorway/simditor
biallo Jan 18, 2018
faf3af6
FIX: 调整 table 的 allowedAttributes
biallo Jan 22, 2018
06e8aee
FIX: 在编辑器没有 focus 时调整表格的列宽,所做调整没有被保存起来
biallo Jan 22, 2018
81dc2f8
FIX: 粘贴表格后,导致已有的表格无法再调整列宽
biallo Feb 8, 2018
5329d01
Merge pull request #512 from mycolorway/biallo/fix-table-resize
biallo Feb 28, 2018
7812302
FIX: 修复了粘贴时会出现大量无用 span 标签的问题
biallo Feb 28, 2018
3a29604
Merge pull request #513 from mycolorway/biallo/fix-formatter
biallo Feb 28, 2018
85230a1
FIX: 将字体从其它大小设置为「正常大小」时,会导致文本的其它样式丢失
biallo Feb 28, 2018
2795f22
Merge pull request #514 from mycolorway/biallo/fix-font-scale
biallo Feb 28, 2018
3b6d68f
Publish v2.3.12
biallo Feb 28, 2018
b90a014
FIX: 从其它地方拷贝过来的多层列表,在多次回车后可能出现内容被清除的情况
biallo Mar 1, 2018
ceb231b
Merge pull request #515 from mycolorway/biallo/fix-list
biallo Mar 9, 2018
5afc748
FIX: 删除表格之后的换行,导致表格无法再调整宽度
biallo Mar 9, 2018
6f655a9
Merge pull request #516 from mycolorway/biallo/fix-table
biallo Mar 9, 2018
b938997
Publish v2.3.13
biallo Mar 9, 2018
c43198a
CHG: 允许 B,I,U,S 标签的 style 中使用 font-size
biallo May 9, 2018
fdb24f7
Publish v2.3.14
biallo May 9, 2018
5761db1
FIX: code 功能在 inline 模式下,内容过长时不会自动换行
biallo May 15, 2018
69fa956
Update README.md
RuochenLyu May 18, 2018
76d091f
FIX: 全选复制整段文字,粘贴后会错误的出现在第一行的前边
biallo Jun 13, 2018
8c7020a
FIX: 在代码块中换行后粘贴内容,会被错误的添加到末尾
biallo Jun 14, 2018
5312417
Publish v2.3.16
biallo Jun 14, 2018
f9539e8
Merge pull request #520 from mycolorway/biallo/fix-paste
biallo Jun 14, 2018
4df0edc
CHG: 清理粘贴内容
biallo Jul 19, 2018
8aa30ad
Publish v2.3.18
biallo Jul 23, 2018
50173c2
CHG: 允许链接使用 ftp 或 file 协议
biallo Aug 14, 2018
6406a90
CHG: 链接支持 mailto 和 tel
biallo Aug 14, 2018
47df116
Publish v2.3.19
biallo Aug 14, 2018
0937d75
FIX: sync before submit form
biallo Aug 23, 2018
2bc9ea4
Publish v2.3.20
biallo Aug 23, 2018
65d78cb
CHG: bug fix
farthinker Oct 17, 2018
ef01a64
ADD: DOMPurify for preventing xss attacks
farthinker Nov 9, 2018
28d22af
CHG: update dependencies
farthinker Nov 9, 2018
61e8495
CHG: calculate the position of paste bin
farthinker Apr 17, 2019
5168b58
CHG: fix paste bin position calculation
farthinker Apr 18, 2019
783ca97
CHG: fix paste bin position calculation
farthinker Apr 18, 2019
d7f3e06
FIX: Image onload not triggered with edge
louis-she Apr 30, 2019
c611d2c
ADD: toolbarScrollContainer for Toolbar
louis-she Jul 22, 2019
b0cb78e
FIX: comments
louis-she Jul 22, 2019
2d002a1
Merge pull request #543 from mycolorway/scl/add-toolbar-container-option
farthinker Jul 22, 2019
88b3e80
CHG: rebuild
farthinker Jul 22, 2019
9e992fb
CHG: fix isEmptyNode helper
farthinker Jul 30, 2019
4eb1259
CHG: edge support paste image
farthinker Aug 15, 2019
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions .bowerrc

This file was deleted.

1 change: 1 addition & 0 deletions .ruby-version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
2.3.1
9 changes: 2 additions & 7 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,9 +1,4 @@
if ENV['CIRCLECI']
source 'https://rubygems.org'
else
source 'http://ruby.taobao.org'
end
source 'https://rubygems.org'

gem 'github-pages'
gem 'github-pages', '50'
gem 'sass'

51 changes: 31 additions & 20 deletions Gruntfile.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,13 @@ module.exports = (grunt) ->
'src/util.coffee'
'src/toolbar.coffee'
'src/indentation.coffee'
'src/clipboard.coffee'
'src/core.coffee'
'src/i18n.coffee'
'src/buttons/button.coffee'
'src/buttons/popover.coffee'
'src/buttons/title.coffee'
'src/buttons/font-scale.coffee'
'src/buttons/bold.coffee'
'src/buttons/italic.coffee'
'src/buttons/underline.coffee'
Expand All @@ -47,7 +49,7 @@ module.exports = (grunt) ->
dest: 'site/assets/scripts/'
ext: '.js'

muduleSpec:
moduleSpec:
expand: true
flatten: true
src: 'spec/src/*.coffee'
Expand Down Expand Up @@ -86,17 +88,18 @@ module.exports = (grunt) ->
objectToExport: 'Simditor'
globalAlias: 'Simditor'
deps:
'default': ['$', 'SimpleModule', 'simpleHotkeys', 'simpleUploader']
amd: ['jquery', 'simple-module', 'simple-hotkeys', 'simple-uploader']
cjs: ['jquery', 'simple-module', 'simple-hotkeys', 'simple-uploader']
'default': ['$', 'SimpleModule', 'simpleHotkeys', 'simpleUploader', 'DOMPurify']
amd: ['jquery', 'simple-module', 'simple-hotkeys', 'simple-uploader', 'dompurify']
cjs: ['jquery', 'simple-module', 'simple-hotkeys', 'simple-uploader', 'dompurify']
global:
items: ['jQuery', 'SimpleModule', 'simple.hotkeys', 'simple.uploader']
items: ['jQuery', 'SimpleModule', 'simple.hotkeys', 'simple.uploader', 'window.DOMPurify']
prefix: ''
suffix: ''

copy:
vendor:
files: [{
src: 'vendor/bower/jquery/dist/jquery.min.js',
src: 'node_modules/jquery/dist/jquery.min.js',
dest: 'site/assets/scripts/jquery.min.js'
}]
styles:
Expand All @@ -106,14 +109,17 @@ module.exports = (grunt) ->
}]
scripts:
files: [{
src: 'vendor/bower/simple-module/lib/module.js',
src: 'node_modules/simple-module/lib/module.js',
dest: 'site/assets/scripts/module.js'
}, {
src: 'vendor/bower/simple-uploader/lib/uploader.js',
src: 'node_modules/simple-uploader/lib/uploader.js',
dest: 'site/assets/scripts/uploader.js'
}, {
src: 'vendor/bower/simple-hotkeys/lib/hotkeys.js',
src: 'node_modules/simple-hotkeys/lib/hotkeys.js',
dest: 'site/assets/scripts/hotkeys.js'
}, {
src: 'node_modules/dompurify/dist/purify.js',
dest: 'site/assets/scripts/dompurify.js'
}, {
src: 'lib/simditor.js',
dest: 'site/assets/scripts/simditor.js'
Expand All @@ -126,17 +132,20 @@ module.exports = (grunt) ->
src: 'lib/*',
dest: 'package/scripts/'
}, {
src: 'vendor/bower/jquery/dist/jquery.min.js',
src: 'node_modules/jquery/dist/jquery.min.js',
dest: 'package/scripts/jquery.min.js'
}, {
src: 'vendor/bower/simple-module/lib/module.js',
src: 'node_modules/simple-module/lib/module.js',
dest: 'package/scripts/module.js'
}, {
src: 'vendor/bower/simple-uploader/lib/uploader.js',
src: 'node_modules/simple-uploader/lib/uploader.js',
dest: 'package/scripts/uploader.js'
}, {
src: 'vendor/bower/simple-hotkeys/lib/hotkeys.js',
src: 'node_modules/simple-hotkeys/lib/hotkeys.js',
dest: 'package/scripts/hotkeys.js'
}, {
src: 'node_modules/dompurify/dist/purify.js',
dest: 'package/scripts/dompurify.js'
}, {
expand: true,
flatten: true
Expand Down Expand Up @@ -181,6 +190,7 @@ module.exports = (grunt) ->
options:
server: 'server.js'
bases: '_site'
port: 3001

uglify:
simditor:
Expand Down Expand Up @@ -211,7 +221,7 @@ module.exports = (grunt) ->
expand: true,
cwd: 'package/'
src: '**',
dest: './'
dest: 'simditor-<%= pkg.version %>/'
}]

clean:
Expand All @@ -231,10 +241,11 @@ module.exports = (grunt) ->
'spec/buttons/*.js'
]
vendor: [
'vendor/bower/jquery/dist/jquery.min.js'
'vendor/bower/simple-module/lib/module.js'
'vendor/bower/simple-uploader/lib/uploader.js'
'vendor/bower/simple-hotkeys/lib/hotkeys.js'
'node_modules/jquery/dist/jquery.min.js'
'node_modules/simple-module/lib/module.js'
'node_modules/simple-uploader/lib/uploader.js'
'node_modules/simple-hotkeys/lib/hotkeys.js'
'node_modules/dompurify/dist/purify.js'
]

curl:
Expand All @@ -257,9 +268,9 @@ module.exports = (grunt) ->
grunt.loadNpmTasks 'grunt-banner'
grunt.loadNpmTasks 'grunt-curl'

grunt.registerTask 'default', ['site', 'express', 'jasmine:test:build', 'watch']
grunt.registerTask 'default', ['site', 'express', 'watch']
grunt.registerTask 'site', ['sass', 'coffee', 'umd', 'copy:vendor', 'copy:scripts', 'copy:styles', 'usebanner', 'jekyll']
grunt.registerTask 'test', ['sass', 'coffee', 'umd', 'jasmine']
grunt.registerTask 'test', ['coffee:moduleSpec', 'coffee:buttonSpec', 'jasmine']
grunt.registerTask 'package', ['clean:package', 'copy:package', 'uglify:simditor', 'compress']

grunt.registerTask 'fonticons', ['curl']
16 changes: 8 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
[![Build Status](https://circleci.com/gh/mycolorway/simditor.png?circle-token=d1e5efa8fbb4ca55af41cb2decc1c7ea40974e7d)](https://circleci.com/gh/mycolorway/simditor)
### Simditor

Simditor是团队协作工具 [Tower](http://tower.im) 使用的富文本编辑器。
---

相比传统的编辑器它的特点是:
Simditor is a browser-based WYSIWYG text editor.

* 功能精简,加载快速
* 输出格式化的标准HTML
* 每一个功能都有非常优秀的使用体验
It is used by [Tower](http://tower.im) -- a popular project management web application.

兼容的浏览器:IE10+、Chrome、Firefox、Safari。
Supported Browsers: IE10+、Chrome、Firefox、Safari.
* [Download Zip](https://github.com/mycolorway/simditor/releases)
* Install with npm: $ npm install simditor</li>

Demo和文档:http://simditor.tower.im/
Demo and docs can be found [here](http://simditor.tower.im/).
40 changes: 0 additions & 40 deletions bower.json

This file was deleted.

5 changes: 0 additions & 5 deletions circle.yml

This file was deleted.

Loading