Skip to content

Commit

Permalink
change textare height
Browse files Browse the repository at this point in the history
  • Loading branch information
machuanjia committed Jan 11, 2016
1 parent 863d904 commit 915baa2
Show file tree
Hide file tree
Showing 8 changed files with 20 additions and 12 deletions.
2 changes: 1 addition & 1 deletion bower.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "angular-wt-editor",
"version": "1.0.15",
"version": "1.0.17",
"homepage": "https://github.com/WorktileTech/angular-wt-editor",
"authors": [
"YCTech"
Expand Down
2 changes: 1 addition & 1 deletion demo/index.html
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<!DOCTYPE html><html ng-app="demoApp"><head lang="en"> <meta charset="UTF-8"> <title>wt-editor</title> <link rel="stylesheet" href="../bower_components/bootstrap/dist/css/bootstrap.css"/> <link rel="stylesheet" href="../bower_components/fontawesome/css/font-awesome.min.css"/> <link rel="stylesheet" href="../bower_components/katex-build/katex.min.css"/> <link rel="stylesheet" href="../bower_components/mermaid-min/mermaid.css"/> <link rel="stylesheet" href="../src/css/markdown.css"/> <link rel="stylesheet" href="../src/css/main.css"/> <style> html,body{ height: 100%; padding: 0; margin: 0; overflow: hidden; } </style></head><body ng-controller="demoCtrl"><div style="width: 1200px;height: 400px;margin: auto;margin-top: 150px"> <!--&#45;&#45;{{content}}--> <!--<wt-editor ng-model="content" config="{hideButtons:[],type:'all',onShow:onShow,onPreview:onPreview,onChange:onChange,replaceButtons:[{title:'插入图片',className:'fa fa-file-image-o',type:'custom',action:imageFn,id:17}],additionalButtons:[{title:'扩展',className:'fa fa-music',type:'custom',action:musicFn,before:2}]}"></wt-editor>--> <!--<wt-editor ng-model="content" config="{hideButtons:[],type:'all',onShow:onShow,onPreview:onPreview,onChange:onChange}"></wt-editor>--> <wt-editor ng-model="content" config="{hideButtons:[],type:'simple',onShow:onShow,onPreview:onPreview,onChange:onChange}"></wt-editor></div><script src="../bower_components/angular/angular.js"></script><script src="../bower_components/angular-bootstrap/ui-bootstrap-tpls.js"></script><script src="../bower_components/jquery/dist/jquery.js"></script><script src="../bower_components/bootstrap/dist/js/bootstrap.js"></script><script src="../bower_components/lodash/lodash.js"></script><script src="../bower_components/Caret.js/dist/jquery.caret.js"></script><!--<script src="../bower_components/markedown/markedown.min.js"></script>--><script src="../bower_components/marked/marked.min.js"></script><script src="../bower_components/katex-build/katex.min.js"></script><script src="../bower_components/mermaid-min/mermaid.full.min.js"></script><script src="../src/wt-editor.tpl.js"></script><script src="../src/wt-editor.js"></script><script> angular.module("demoApp",['wt-editor']). controller('demoCtrl',['$scope','$http',function($scope,$http){ $scope.content = ""; $scope.musicFn = function($event,vmobj){ alert(vmobj.getContent()); vmobj.insertContent("-----我的祖国------"); } $scope.imageFn = function($event,vmobj){ alert(vmobj.getContent()); vmobj.insertContent("--------这是个图片--------"); } $scope.onShow = function(){console.log("-----onshow事件")} $scope.onPreview = function(value){console.log("-----onPreview事件:"+value)} $scope.onChange = function(value){ console.log("-----onChange事件:"+$scope.content) } $http({method:'GET', url:'sample.md'}).success(function(rv){ $scope.content = rv; }); }]);</script></body></html>
<!DOCTYPE html><html ng-app="demoApp"><head lang="en"> <meta charset="UTF-8"> <title>wt-editor</title> <link rel="stylesheet" href="../bower_components/bootstrap/dist/css/bootstrap.css"/> <link rel="stylesheet" href="../bower_components/fontawesome/css/font-awesome.min.css"/> <link rel="stylesheet" href="../bower_components/katex-build/katex.min.css"/> <link rel="stylesheet" href="../bower_components/mermaid-min/mermaid.css"/> <link rel="stylesheet" href="../src/css/markdown.css"/> <link rel="stylesheet" href="../src/css/main.css"/> <style> html,body{ height: 100%; padding: 0; margin: 0; overflow: hidden; } </style></head><body ng-controller="demoCtrl"><div style="width: 1200px;height: 400px;margin: auto;margin-top: 150px"> <!--&#45;&#45;{{content}}--> <!--<wt-editor ng-model="content" config="{hideButtons:[],type:'all',onShow:onShow,onPreview:onPreview,onChange:onChange,replaceButtons:[{title:'插入图片',className:'fa fa-file-image-o',type:'custom',action:imageFn,id:17}],additionalButtons:[{title:'扩展',className:'fa fa-music',type:'custom',action:musicFn,before:2}]}"></wt-editor>--> <!--<wt-editor ng-model="content" config="{hideButtons:[],type:'all',onShow:onShow,onPreview:onPreview,onChange:onChange}"></wt-editor>--> <wt-editor ng-model="content" config="{hideButtons:[],type:'all',onShow:onShow,onPreview:onPreview,onChange:onChange,className:'sss'}"></wt-editor></div><script src="../bower_components/angular/angular.js"></script><script src="../bower_components/angular-bootstrap/ui-bootstrap-tpls.js"></script><script src="../bower_components/jquery/dist/jquery.js"></script><script src="../bower_components/bootstrap/dist/js/bootstrap.js"></script><script src="../bower_components/lodash/lodash.js"></script><script src="../bower_components/Caret.js/dist/jquery.caret.js"></script><!--<script src="../bower_components/markedown/markedown.min.js"></script>--><script src="../bower_components/marked/marked.min.js"></script><script src="../bower_components/katex-build/katex.min.js"></script><script src="../bower_components/mermaid-min/mermaid.full.min.js"></script><script src="../src/wt-editor.tpl.js"></script><script src="../src/wt-editor.js"></script><script> angular.module("demoApp",['wt-editor']). controller('demoCtrl',['$scope','$http',function($scope,$http){ $scope.content = ""; $scope.musicFn = function($event,vmobj){ alert(vmobj.getContent()); vmobj.insertContent("-----我的祖国------"); } $scope.imageFn = function($event,vmobj){ alert(vmobj.getContent()); vmobj.insertContent("--------这是个图片--------"); } $scope.onShow = function(){console.log("-----onshow事件")} $scope.onPreview = function(value){console.log("-----onPreview事件:"+value)} $scope.onChange = function(value){ console.log("-----onChange事件:"+$scope.content) } $http({method:'GET', url:'sample.md'}).success(function(rv){ $scope.content = rv; }); }]);</script></body></html>
Expand Down
4 changes: 2 additions & 2 deletions dist/wt-editor-min.js
View file

Large diffs are not rendered by default.

Loading

0 comments on commit 915baa2

Please sign in to comment.