Skip to content

Commit

Permalink
修复BUG
Browse files Browse the repository at this point in the history
修复上传网络图片链接width和height为0的BUG
  • Loading branch information
asxldb committed Jun 22, 2020
1 parent 8a6c849 commit 37754d3
Show file tree
Hide file tree
Showing 8 changed files with 1,223 additions and 1,115 deletions.
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@ 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.

http://www.opensource.org/licenses/mit-license.php
http://www.opensource.org/licenses/mit-license.php
10 changes: 10 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ iceEditor官方群:324415936

#### 最新更新
# iceEditor v1.1.6
+ **2020-06-22**
+ [修复] 上传网络图片链接width和height为0的BUG
+ **2020-06-20**
+ [修复] textarea内容中的pre代码格式
+ [新增] 新增代码语言(扩展)
Expand Down Expand Up @@ -53,9 +55,17 @@ iceEditor官方群:324415936
#### 注意
iceEditor.js的引用禁止放在head标签内,请尽量放在body中或body后面!

#### 引入
+ 下载下来直接引入iceEditor.js即可,放在body中或body后面
+ 推荐引入下面的cdn加速链接
+ CDN最新版:https://cdn.jsdelivr.net/gh/iceuinet/iceEditor/iceEditor.min.js
+ 需要CDN历史版,请更改@后面的版本号,最低为1.1.6版本
+ 历史版:https://cdn.jsdelivr.net/gh/iceuinet/iceEditor@1.1.6/iceEditor.min.js

#### 使用
```html
<div id="editor"> 欢迎使用iceEditor富文本编辑器 </div>
<script type="text/javascript" src="https://cdn.jsdelivr.net/gh/iceuinet/iceEditor/iceEditor.min.js"></script>
```
```javascript
//第一步:创建实例化对象
Expand Down
8 changes: 4 additions & 4 deletions demo.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@
<div style="text-align: center;font-size:20px;margin-bottom: 20px;">演示DEMO</div>
<div style="text-align: center;font-size:15px;margin-bottom: 20px;">官方:<a href="https://www.iceui.net/iceEditor.html" target="_blank">https://www.iceui.net/iceEditor.html</a></div>
<textarea id="content"></textarea>
<script type="text/JavaScript" src="iceEditor.js"></script>
<script type="text/JavaScript" src="src/iceEditor.js"></script>
<script>
//自定义编辑器菜单
var e = new ice.editor("content");
e.uploadUrl="upload.php";
e.uploadUrl="src/upload.php";
e.screenshot = true;
e.screenshotUpload = false;
//edit.menu=['fontSize','foreColor','bold','italic','underline','strikeThrough','line','justifyLeft','justifyCenter','justifyRight','line','table','insertImage','video'];
Expand Down Expand Up @@ -106,8 +106,8 @@
}
});
e.create();
e.setValue(`<p>本实例js脚<del>本本<i>实例</i>js脚</del>本本实例js脚本:</p><p><br></p>
<pre class="iceCode:js">asdfasdf<br>var str = 'hello world';<br>console.log(str);<br></pre>
e.setValue(`<p>本实例js脚本:</p><p><br></p>
<pre class="iceCode:js">var str = 'hello world';<br>console.log(str);<br></pre>
<p><br></p><p><font color="#00b050" size="2">//实例化(传递一个id)</font></p><p><font color="#595959" size="2">var edit = new ice.editor("content");</font></p><p><br></p><p><font color="#00b050" size="2">//自定义编辑器工具栏菜单(默认展示所有功能)</font></p><p><font color="#595959" size="2">edit.menu=["fontSize","foreColor","bold","italic","underline","strikeThrough","line","justifyLeft","justifyCenter","justifyRight","line","table","insertImage"];</font></p><p><br></p><p><font color="#00b050" size="2">//编辑器创建</font></p><p><font color="#595959" size="2">edit.create();</font></p>`);
</script>

Expand Down
19 changes: 0 additions & 19 deletions iceEditor-min.js

This file was deleted.

Loading

0 comments on commit 37754d3

Please sign in to comment.