Skip to content

Commit 9ea56b9

Browse files
wangfupeng1988wangfupeng1988
committed
merge v3
2 parents d79391e + bcb4d6d commit 9ea56b9

File tree

121 files changed

+11769
-1603
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

121 files changed

+11769
-1603
lines changed

‎.eslintignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
src/js/util/ierange.js
2+
src/js/util/poly-fill.js

‎.eslintrc.json

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
{
2+
"env": {
3+
"browser": true,
4+
"commonjs": true,
5+
"es6": true
6+
},
7+
"globals": {
8+
"ENV": true
9+
},
10+
"extends": "eslint:recommended",
11+
"parserOptions": {
12+
"sourceType": "module"
13+
},
14+
"rules": {
15+
"no-console":0,
16+
"indent": [
17+
"error",
18+
4
19+
],
20+
"linebreak-style": [
21+
"error",
22+
"unix"
23+
],
24+
"quotes": [
25+
"error",
26+
"single",
27+
{
28+
"allowTemplateLiterals": true
29+
}
30+
],
31+
"semi": [
32+
"error",
33+
"never"
34+
],
35+
"no-unused-vars": 0,
36+
"no-debugger": 0
37+
}
38+
}

‎.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,12 @@
11

22
#忽略
33
node_modules/*
4+
<<<<<<< HEAD
45
issue
6+
=======
7+
>>>>>>> v3
58
npm-debug.log
9+
ISSUE.md
610

711
# Windows image file caches
812
Thumbs.db

‎.jshintrc

Lines changed: 0 additions & 17 deletions
This file was deleted.

‎.npmignore

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,5 @@
11
node_modules/*
2-
src/css/*
3-
src/js/*
4-
issue
52
npm-debug.log
6-
static/*
7-
test/*
8-
uploadfiles/*
9-
server.js
10-
server-for-cros.js
3+
docs/*
4+
src/*
5+
example/*

‎ISSUE.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
# 当前遗留的一些问题
2+
3+
- 删除掉`./release`之后，执行`npm run release`会报错，原因是`fonts`文件没拷贝全，就要去替换`css`中的字体文件为`base64`格式，导致找不到文件。
4+
- 针对编辑区域的`max-height`和`min-height`做一些处理，而且和全屏还不能通用
5+
- 先点击'B'再输入内容这种形式，前期先支持 webkit 和 IE，火狐的支持后面再加上
6+
- Panel 在右上角增加一个“关闭”按钮
7+
- src/js/editor/Bar 改为 Progress，仅供上传图片使用
8+
9+
10+
项目徽章 https://github.com/EyreFree/GitHubBadgeIntroduction

‎LICENSE

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
The MIT License (MIT)
2+
3+
Copyright (c) 2017 王福朋
4+
5+
Permission is hereby granted, free of charge, to any person obtaining a copy
6+
of this software and associated documentation files (the "Software"), to deal
7+
in the Software without restriction, including without limitation the rights
8+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9+
copies of the Software, and to permit persons to whom the Software is
10+
furnished to do so, subject to the following conditions:
11+
12+
The above copyright notice and this permission notice shall be included in all
13+
copies or substantial portions of the Software.
14+
15+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21+
SOFTWARE.
22+

‎README.md

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
2+
# wangEditor
3+
4+
## 介绍
5+
6+
**wangEditor** —— 轻量级 web 富文本编辑器，配置方便，使用简单。支持 IE10+ 浏览器。
7+
8+
- 官网：[www.wangEditor.com](http://www.wangeditor.com/)
9+
- 文档：[www.kancloud.cn/wangfupeng/wangeditor3/332599](http://www.kancloud.cn/wangfupeng/wangeditor3/332599)
10+
11+
![图片](http://images2015.cnblogs.com/blog/138012/201705/138012-20170530202905633-1840158981.png)
12+
13+
*查看 v2 版本的代码和文档点击[这里](https://github.com/wangfupeng1988/wangEditor/tree/v2)*
14+
15+
16+
## 下载
17+
18+
- 直接下载：[https://github.com/wangfupeng1988/wangEditor/releases](https://github.com/wangfupeng1988/wangEditor/releases)
19+
- 使用`npm`下载：`npm install wangeditor` （注意 `wangeditor` 全部是**小写字母**）
20+
- 使用`bower`下载：`bower install wangEditor` （前提保证电脑已安装了`bower`）
21+
- 使用CDN：[www.bootcdn.cn/wangeditor](http://www.bootcdn.cn/wangeditor/)
22+
23+
24+
## 使用
25+
26+
```javascript
27+
var E = window.wangEditor
28+
var editor2 = new E('#div3')
29+
editor2.create()
30+
```
31+
32+
33+
## 运行 demo
34+
35+
- 下载源码 `git clone git@github.com:wangfupeng1988/wangEditor.git`
36+
- 安装或者升级最新版本 node（最低`v6.x.x`）
37+
- 进入目录，安装依赖包 `cd wangEditor && npm i`
38+
- 安装包完成之后，windows 用户运行`npm run win-example`，Mac 用户运行`npm run example`
39+
- 打开浏览器访问[localhost:3000/index.html](http://localhost:3000/index.html)
40+
41+
## 交流
42+
43+
### QQ 群
44+
45+
以下 QQ 群欢迎加入交流问题（可能有些群已经满员）
46+
47+
- 164999061
48+
- 281268320
49+
50+
### 提问
51+
52+
注意，作者只受理以下几种提问方式，其他方式直接忽略
53+
54+
- 直接在 [github issues](https://github.com/wangfupeng1988/wangEditor/issues) 提交问题
55+
- 去[知乎](https://www.zhihu.com/)提问，并邀请[作者](https://www.zhihu.com/people/wang-fu-peng-54/activities)来回答
56+
- 去[segmentfault](https://segmentfault.com)提问，并邀请[作者](https://segmentfault.com/u/wangfupeng1988)来回答
57+
58+
## 关于作者
59+
60+
- 关注作者的博客 - 《[深入理解javascript原型和闭包系列](http://www.cnblogs.com/wangfupeng1988/p/4001284.html)》《[深入理解javascript异步系列](https://github.com/wangfupeng1988/js-async-tutorial)》《[CSS知多少](http://www.cnblogs.com/wangfupeng1988/p/4325007.html)》
61+
- 学习作者的教程 - 《[React.js模拟大众点评webapp](http://coding.imooc.com/class/99.html)》《[zepto设计与源码分析](http://www.imooc.com/learn/745)》《[用grunt搭建自动化的web前端开发环境](http://study.163.com/course/courseMain.htm?courseId=1103003)》《[json2.js源码解读](http://study.163.com/course/courseMain.htm?courseId=691008)》
62+
63+
如果你感觉有收获，欢迎给我打赏 ———— 以激励我更多输出优质开源内容
64+
65+
![图片](https://camo.githubusercontent.com/e1558b631931e0a1606c769a61f48770cc0ccb56/687474703a2f2f696d61676573323031352e636e626c6f67732e636f6d2f626c6f672f3133383031322f3230313730322f3133383031322d32303137303232383131323233373739382d313530373139363634332e706e67)
66+

‎bower.json

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
{
2+
"name": "wangEditor",
3+
"description": "wangEditor - 基于javascript和css开发的 web 富文本编辑器， 轻量、简洁、易用、开源免费",
4+
"main": "release/wangEditor.js",
5+
"authors": [
6+
"wangfupeng <wangfupeng1988@163.com>"
7+
],
8+
"license": "MIT",
9+
"keywords": [
10+
"wangEditor",
11+
"web 富文本编辑器"
12+
],
13+
"homepage": "https://github.com/wangfupeng1988/wangEditor",
14+
"moduleType": [
15+
"amd",
16+
"cmd",
17+
"node"
18+
],
19+
"private": true
20+
}

‎docs/dev/README.md

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
面向开发者的文档
2+
3+
4+
框架介绍
5+
6+
- 下载和运行
7+
- 目录结构介绍
8+
- `example`目录
9+
- `src`目录（`js`目录，`less`目录）
10+
- `package.json`
11+
- `gulpfile.js`
12+
13+
如何提交 PR
14+
15+
16+
17+
上线
18+
19+
- 修改`package.json`版本
20+
- 提交到github，并创建tag
21+
- 提交到 npm
22+
- 同步到官网
23+
- 同步到 bootcdn
24+
- 更新文档
25+
- 文档同步到 kancloud
26+
- ……
27+

0 commit comments

Comments
 (0)