Skip to content

Commit acbdf08

Browse files
author
Dean Sofer
committed
Removed TinyMCE temporarily due to conflicts
1 parent 3a8c177 commit acbdf08

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

index.html

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -337,7 +337,7 @@ <h1>Modal</h1>
337337
<h3>What?</h3>
338338
<p>Takes the twitter bootstrap modal and lets you assign an ng-model to it. You can open/close the modal any way you want: data-* attributes, or use elm.modal('show'), or whatever. The ng-model you give will always correspond to whether the modal is opened or not, and if you set it it will also change the modal.
339339
<p>
340-
<div id="myModal" class="modal hide" ui-modal ng-model="modalShown">
340+
<div id="myModal" class="modal hide fade" ui-modal ng-model="modalShown">
341341
<div class="modal-header"><h1>Modalin'!</h1></div>
342342
<div class="modal-body">
343343
<p>Cool beans, dude.</p>
@@ -485,12 +485,13 @@ <h3>How?</h3>
485485
<div class="page-header">
486486
<h1>TinyMCE</h1>
487487
</div>
488+
<p class="alert alert-error"><i class="icon-info-sign"></i> Demo disabled temporarily due to conflicts with other directives. Use at your own risk!</p>
488489
<div class="row">
489490
<div class="span6">
490491
<h3>What?</h3>
491492
<p>TinyMCE WYSIWYG integration</p>
492493
<div class="well">
493-
<textarea ui-tinymce="{theme:'simple'}" ng-model="tinymce"></textarea>
494+
<textarea ng-model="tinymce"></textarea>
494495
<h4>Output:</h4>
495496
<p>{{tinymce}}</p>
496497
</div>

0 commit comments

Comments
 (0)