Skip to content

Commit 0b84c61

Browse files
committed
Added optional addon tinymce to examples
1 parent 8b8cff7 commit 0b84c61

File tree

3 files changed

+26
-5
lines changed

3 files changed

+26
-5
lines changed

bower.json

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,10 @@
22
"name": "angular-schema-form",
33
"main": [
44
"dist/schema-form.min.js",
5-
"dist/bootstrap-decorator.min.js"
5+
"dist/bootstrap-decorator.min.js",
6+
"dist/bootstrap-datepicker.min.js"
67
],
7-
"version": "0.7.3",
8+
"version": "0.7.2",
89
"authors": [
910
"Textalk",
1011
"David Jensen <david.lgj@gmail.com>"
@@ -39,6 +40,7 @@
3940
"angular-schema-form-datepicker": ">= 0.1.0",
4041
"jquery": "~2.1.1",
4142
"angular-mocks": ">= 1.2",
42-
"angular-schema-form-colorpicker": "~0.1.0"
43+
"angular-schema-form-colorpicker": ">= 0.1.0",
44+
"tx-tinymce": ">= 0.0.5"
4345
}
4446
}

examples/bootstrap-example.html

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,12 +82,16 @@ <h3>Schema</h3>
8282

8383
<script type="text/javascript" src="../dist/schema-form.min.js"></script>
8484
<script type="text/javascript" src="../dist/bootstrap-decorator.min.js"></script>
85-
<script type="text/javascript" src="../bower_components/angular-schema-form-datepicker/bootstrap-datepicker.min.js"></script>
86-
85+
<script type="text/javascript" src="../dist/bootstrap-datepicker.min.js"></script>
8786
<script type="text/javascript" src="../bower_components/angular-schema-form-colorpicker/bootstrap-colorpicker.min.js"></script>
8887

88+
<!-- <script src="//tinymce.cachefly.net/4.0/tinymce.min.js"></script>
89+
<script type="text/javascript" src="../bower_components/tx-tinymce/tx-tinymce.js"></script>
90+
<script type="text/javascript" src="../bower_components/angular-schema-form-tinymce/bootstrap-tinymce.js"></script> -->
91+
8992
<script type="text/javascript">
9093

94+
// To test the tinymce addon, uncomment the files above and inject 'tx-tinymce' below.
9195
angular.module('test',['schemaForm','ui.ace']).controller('TestCtrl', function($scope,$http){
9296

9397
$scope.tests = [

examples/data/sink.json

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,12 @@
1313
"pattern": "^[^/]*$",
1414
"minLength": 2
1515
},
16+
"invitation": {
17+
"type": "string",
18+
"format": "html",
19+
"title": "Invitation Design",
20+
"description": "Design the invitation in full technicolor HTML"
21+
},
1622
"favorite": {
1723
"title": "Favorite",
1824
"type": "string",
@@ -151,6 +157,15 @@
151157
"key": "shoesize",
152158
"feedback": false
153159
},
160+
{
161+
"key": "invitation",
162+
"tinymceOptions": {
163+
"toolbar": [
164+
"undo redo| styleselect | bold italic | link image",
165+
"alignleft aligncenter alignright"
166+
]
167+
}
168+
},
154169
"things",
155170
"dislike"
156171
]

0 commit comments

Comments
 (0)