Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Master #97

Open
wants to merge 10 commits into
base: 2.0-dev
Choose a base branch
from
Open

Master #97

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
6d4d14a
Updated dependency files to use Bower files instead of CDN
Oct 28, 2015
162cfc5
Updated dependency files to use Bower files instead of CDN
Oct 28, 2015
7f0b3a3
Merge branch 'examples-update' of github.com:RandomlyKnighted/bootstr…
Dec 30, 2015
595c507
Fixed UI bug with inserting pictures
Jan 2, 2016
8fd12eb
Fixed broken url in index.html
Jan 19, 2016
ea8c5c1
Don't trash content when initialising placeholder handling
May 18, 2016
fd5d790
Optimise jQuery usage around placeholder
May 18, 2016
0332c21
NPM improvements
May 18, 2016
47cea65
Merge pull request #68 from RandomlyKnighted/examples-update
steveathon Jun 5, 2016
6ab5a9f
Merge pull request #96 from pugnascotia/master
steveathon Jun 5, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions examples/basic.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>A tiny, opensource, Bootstrap WYSIWYG rich text editor</title>
<link href="../bower_components/google-code-prettify/src/prettify.css" rel="stylesheet" />
<link rel="stylesheet" href="http://netdna.bootstrapcdn.com/bootstrap/3.3.5/css/bootstrap.min.css" />
<link rel="stylesheet" href="http://netdna.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.css" />
<link href="../css/style.css" rel="stylesheet" />
<link href="../bower_components/bootstrap/dist/css/bootstrap.min.css" rel="stylesheet" />
<link href="../bower_components/fontawesome/css/font-awesome.min.css" rel="stylesheet" />
<link href="./css/style.css" rel="stylesheet" />

<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.11.0/jquery.min.js"></script>
<script src="../bower_components/jquery/dist/jquery.min.js"></script>>
<script src="../bower_components/jquery.hotkeys/jquery.hotkeys.js"></script>
<script src="http://netdna.bootstrapcdn.com/bootstrap/3.3.5/js/bootstrap.min.js"></script>
<script src="../bower_components/bootstrap/dist/js/bootstrap.min.js"></script>
<script src="../bower_components/google-code-prettify/src/prettify.js"></script>
<script src="../src/bootstrap-wysiwyg.js"></script>
</head>
Expand All @@ -26,6 +26,8 @@ <h1>Basic editor, no fancy bits.</h1>
href="#!" onClick="$('#editorPreview').html($('#editor').html());">Submit</a>
</p>
</div>
<script type='text/javascript'>$('#editor').wysiwyg();</script>
<script type='text/javascript'>
$('#editor').wysiwyg();
</script>
</body>
</html>
22 changes: 11 additions & 11 deletions examples/clear-formatting.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>A tiny, opensource, Bootstrap WYSIWYG rich text editor</title>
<link href="../bower_components/google-code-prettify/src/prettify.css" rel="stylesheet" />
<link rel="stylesheet" href="http://netdna.bootstrapcdn.com/bootstrap/3.3.5/css/bootstrap.min.css" />
<link href="http://netdna.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.css" rel="stylesheet" />
<link href="../css/style.css" rel="stylesheet" />
<link href="../bower_components/bootstrap/dist/css/bootstrap.min.css" rel="stylesheet" />
<link href="../bower_components/fontawesome/css/font-awesome.min.css" rel="stylesheet" />
<link href="./css/style.css" rel="stylesheet" />
</head>

<body>
<div class="container">

<h1>Simple Editor with Toolbar</h1>
<div class="btn-toolbar" data-role="editor-toolbar"
data-target="#editor">
Expand Down Expand Up @@ -52,9 +52,9 @@ <h1>Simple Editor with Toolbar</h1>
</div>
<div class="btn-group">
<a class="btn btn-default" data-edit="unlink" title="Remove Hyperlink"><i class="fa fa-unlink"></i></a>
<span class="btn btn-default" title="Insert picture (or just drag & drop)" id="pictureBtn"> <i class="fa fa-picture-o"></i>
<input class="imgUpload" type="file" data-role="magic-overlay" data-target="#pictureBtn" data-edit="insertImage" />
</span>
<a id="picBtn" class="btn btn-default" title="Insert picture (or just drag & drop)" onclick="$('#pictureBtn').click();"><i class="fa fa-picture-o"></i></a>

<input id="pictureBtn" class="imgUpload" type="file" data-edit="insertImage" data-role="magic-overlay" />
</div>
<div class="btn-group">
<a class="btn btn-default" data-edit="undo" title="Undo (Ctrl/Cmd+Z)"><i class="fa fa-undo"></i></a>
Expand All @@ -69,14 +69,14 @@ <h1>Simple Editor with Toolbar</h1>
</p>
</div>

<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.11.0/jquery.min.js"></script>
<script src="../bower_components/jquery/dist/jquery.min.js"></script>
<script src="../bower_components/jquery.hotkeys/jquery.hotkeys.js"></script>
<script src="http://netdna.bootstrapcdn.com/bootstrap/3.3.5/js/bootstrap.min.js"></script>
<script src="../bower_components/bootstrap/dist/js/bootstrap.min.js"></script>
<script src="../bower_components/google-code-prettify/src/prettify.js"></script>
<script src="../src/bootstrap-wysiwyg.js"></script>
<script type='text/javascript'>
$('#editor').wysiwyg();

$(".dropdown-menu > input").click(function (e) {
e.stopPropagation();
});
Expand Down
0 css/style.css → examples/css/style.css
View file
Open in desktop
File renamed without changes.
18 changes: 9 additions & 9 deletions examples/events.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>A tiny, opensource, Bootstrap WYSIWYG rich text editor</title>
<link href="../bower_components/google-code-prettify/src/prettify.css" rel="stylesheet" />
<link rel="stylesheet" href="http://netdna.bootstrapcdn.com/bootstrap/3.3.5/css/bootstrap.min.css" />
<link href="http://netdna.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.css" rel="stylesheet" />
<link href="../css/style.css" rel="stylesheet" />
<link href="../bower_components/bootstrap/dist/css/bootstrap.min.css" rel="stylesheet" />
<link href="../bower_components/fontawesome/css/font-awesome.min.css" rel="stylesheet" />
<link href="./css/style.css" rel="stylesheet" />
</head>

<body>
Expand Down Expand Up @@ -52,9 +52,9 @@ <h1>Type something to see events</h1>
</div>
<div class="btn-group">
<a class="btn btn-default" data-edit="unlink" title="Remove Hyperlink"><i class="fa fa-unlink"></i></a>
<span class="btn btn-default" title="Insert picture (or just drag & drop)" id="pictureBtn"> <i class="fa fa-picture-o"></i>
<input class="imgUpload" type="file" data-role="magic-overlay" data-target="#pictureBtn" data-edit="insertImage" />
</span>
<a id="picBtn" class="btn btn-default" title="Insert picture (or just drag & drop)" onclick="$('#pictureBtn').click();"><i class="fa fa-picture-o"></i></a>

<input id="pictureBtn" class="imgUpload" type="file" data-edit="insertImage" data-role="magic-overlay" />
</div>
<div class="btn-group">
<a class="btn btn-default" data-edit="undo" title="Undo (Ctrl/Cmd+Z)"><i class="fa fa-undo"></i></a>
Expand All @@ -68,9 +68,9 @@ <h2>Events fired:</h2>
<p id="events_log"></p>
</div>

<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.11.0/jquery.min.js"></script>
<script src="../bower_components/jquery/dist/jquery.min.js"></script>
<script src="../bower_components/jquery.hotkeys/jquery.hotkeys.js"></script>
<script src="http://netdna.bootstrapcdn.com/bootstrap/3.3.5/js/bootstrap.min.js"></script>
<script src="../bower_components/bootstrap/dist/js/bootstrap.min.js"></script>
<script src="../bower_components/google-code-prettify/src/prettify.js"></script>
<script src="../src/bootstrap-wysiwyg.js"></script>
<script type='text/javascript'>
Expand All @@ -79,7 +79,7 @@ <h2>Events fired:</h2>
$('#editorPreview').html($(this).cleanHtml());
$('#events_log').append(' change');
});

$(".dropdown-menu > input").click(function (e) {
e.stopPropagation();
});
Expand Down
24 changes: 12 additions & 12 deletions examples/form-post.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>A tiny, opensource, Bootstrap WYSIWYG rich text editor</title>
<link href="../bower_components/google-code-prettify/src/prettify.css" rel="stylesheet" />
<link rel="stylesheet" href="http://netdna.bootstrapcdn.com/bootstrap/3.3.5/css/bootstrap.min.css" />
<link href="http://netdna.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.css" rel="stylesheet" />
<link href="../css/style.css" rel="stylesheet" />
<link href="../bower_components/bootstrap/dist/css/bootstrap.min.css" rel="stylesheet" />
<link href="../bower_components/fontawesome/css/font-awesome.min.css" rel="stylesheet" />
<link href="./css/style.css" rel="stylesheet" />
</head>

<body>
<div class="container">

<h1>Simple HTML Editor</h1>
<div class="btn-toolbar" data-role="editor-toolbar"
data-target="#editor">
Expand Down Expand Up @@ -52,9 +52,9 @@ <h1>Simple HTML Editor</h1>
</div>
<div class="btn-group">
<a class="btn btn-default" data-edit="unlink" title="Remove Hyperlink"><i class="fa fa-unlink"></i></a>
<span class="btn btn-default" title="Insert picture (or just drag & drop)" id="pictureBtn"> <i class="fa fa-picture-o"></i>
<input class="imgUpload" type="file" data-role="magic-overlay" data-target="#pictureBtn" data-edit="insertImage" />
</span>
<a id="picBtn" class="btn btn-default" title="Insert picture (or just drag & drop)" onclick="$('#pictureBtn').click();"><i class="fa fa-picture-o"></i></a>

<input id="pictureBtn" class="imgUpload" type="file" data-edit="insertImage" data-role="magic-overlay" />
</div>
<div class="btn-group">
<a class="btn btn-default" data-edit="undo" title="Undo (Ctrl/Cmd+Z)"><i class="fa fa-undo"></i></a>
Expand All @@ -63,17 +63,17 @@ <h1>Simple HTML Editor</h1>
</div>
</div>
<div id="editorPreview"></div>

<form action="php/upload.php" method="post" enctype="multipart/form-data" id='submitForm'>
<div id="editor" class="lead" data-placeholder="This is a basic example with a simple toolbar."></div>
<a class="btn btn-large btn-default jumbo" href="#!" onClick="$('#mySubmission').val($('#editor').cleanHtml(true));$('#submitForm').submit();">Submit</a>
<input type='hidden' name='formSubmission' id='mySubmission'/>
</form>
</div>

<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.11.0/jquery.min.js"></script>
<script src="../bower_components/jquery/dist/jquery.min.js"></script>
<script src="../bower_components/jquery.hotkeys/jquery.hotkeys.js"></script>
<script src="http://netdna.bootstrapcdn.com/bootstrap/3.3.5/js/bootstrap.min.js"></script>
<script src="../bower_components/bootstrap/dist/js/bootstrap.min.js"></script>
<script src="../bower_components/google-code-prettify/src/prettify.js"></script>
<script src="../src/bootstrap-wysiwyg.js"></script>
<script type='text/javascript'>
Expand All @@ -85,7 +85,7 @@ <h1>Simple HTML Editor</h1>
'seperate-binary': false
}
});

$(".dropdown-menu > input").click(function (e) {
e.stopPropagation();
});
Expand Down
24 changes: 12 additions & 12 deletions examples/formatblock-example.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>A tiny, opensource, Bootstrap WYSIWYG rich text editor</title>
<link href="../bower_components/google-code-prettify/src/prettify.css" rel="stylesheet" />
<link rel="stylesheet" href="http://netdna.bootstrapcdn.com/bootstrap/3.3.5/css/bootstrap.min.css" />
<link href="http://netdna.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.css" rel="stylesheet" />
<link href="../css/style.css" rel="stylesheet" />
<link href="../bower_components/bootstrap/dist/css/bootstrap.min.css" rel="stylesheet" />
<link href="../bower_components/fontawesome/css/font-awesome.min.css" rel="stylesheet" />
<link href="./css/style.css" rel="stylesheet" />
</head>

<body>
<div class="container">

<h1>Simple HTML Editor</h1>
<div class="btn-toolbar" data-role="editor-toolbar"
data-target="#editor">
Expand Down Expand Up @@ -64,9 +64,9 @@ <h1>Simple HTML Editor</h1>
</div>
<div class="btn-group">
<a class="btn btn-default" data-edit="unlink" title="Remove Hyperlink"><i class="fa fa-unlink"></i></a>
<span class="btn btn-default" title="Insert picture (or just drag & drop)" id="pictureBtn"> <i class="fa fa-picture-o"></i>
<input class="imgUpload" type="file" data-role="magic-overlay" data-target="#pictureBtn" data-edit="insertImage" />
</span>
<a id="picBtn" class="btn btn-default" title="Insert picture (or just drag & drop)" onclick="$('#pictureBtn').click();"><i class="fa fa-picture-o"></i></a>

<input id="pictureBtn" class="imgUpload" type="file" data-edit="insertImage" data-role="magic-overlay" />
</div>
<div class="btn-group">
<a class="btn btn-default" data-edit="undo" title="Undo (Ctrl/Cmd+Z)"><i class="fa fa-undo"></i></a>
Expand All @@ -80,15 +80,15 @@ <h1>Simple HTML Editor</h1>
<a class="btn btn-large btn-default jumbo" href="#!" onClick="$('#editorPreview').html($('#editor').html());">Submit</a>
</p>
</div>
<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.11.0/jquery.min.js"></script>

<script src="../bower_components/jquery/dist/jquery.min.js"></script>
<script src="../bower_components/jquery.hotkeys/jquery.hotkeys.js"></script>
<script src="http://netdna.bootstrapcdn.com/bootstrap/3.3.5/js/bootstrap.min.js"></script>
<script src="../bower_components/bootstrap/dist/js/bootstrap.min.js"></script>
<script src="../bower_components/google-code-prettify/src/prettify.js"></script>
<script src="../src/bootstrap-wysiwyg.js"></script>
<script type='text/javascript'>
$('#editor').wysiwyg();

$(".dropdown-menu > input").click(function (e) {
e.stopPropagation();
});
Expand Down
22 changes: 11 additions & 11 deletions examples/html-editor.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>A tiny, opensource, Bootstrap WYSIWYG rich text editor</title>
<title>A tiny, opensource, Bootstrap WYSIWYG rich text editor</title>
<link href="../bower_components/google-code-prettify/src/prettify.css" rel="stylesheet" />
<link rel="stylesheet" href="http://netdna.bootstrapcdn.com/bootstrap/3.3.5/css/bootstrap.min.css" />
<link href="http://netdna.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.css" rel="stylesheet" />
<link href="../css/style.css" rel="stylesheet" />
<link href="../bower_components/bootstrap/dist/css/bootstrap.min.css" rel="stylesheet" />
<link href="../bower_components/fontawesome/css/font-awesome.min.css" rel="stylesheet" />
<link href="./css/style.css" rel="stylesheet" />
</head>

<body>
<div class="container">
<h1>Simple HTML Editor</h1>
Expand Down Expand Up @@ -51,9 +51,9 @@ <h1>Simple HTML Editor</h1>
</div>
<div class="btn-group">
<a class="btn btn-default" data-edit="unlink" title="Remove Hyperlink"><i class="fa fa-unlink"></i></a>
<span class="btn btn-default" title="Insert picture (or just drag & drop)" id="pictureBtn"> <i class="fa fa-picture-o"></i>
<input class="imgUpload" type="file" data-role="magic-overlay" data-target="#pictureBtn" data-edit="insertImage" />
</span>
<a id="picBtn" class="btn btn-default" title="Insert picture (or just drag & drop)" onclick="$('#pictureBtn').click();"><i class="fa fa-picture-o"></i></a>

<input id="pictureBtn" class="imgUpload" type="file" data-edit="insertImage" data-role="magic-overlay" />
</div>
<div class="btn-group">
<a class="btn btn-default" data-edit="undo" title="Undo (Ctrl/Cmd+Z)"><i class="fa fa-undo"></i></a>
Expand All @@ -68,14 +68,14 @@ <h1>Simple HTML Editor</h1>
</p>
</div>

<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.11.0/jquery.min.js"></script>
<script src="../bower_components/jquery/dist/jquery.min.js"></script>
<script src="../bower_components/jquery.hotkeys/jquery.hotkeys.js"></script>
<script src="http://netdna.bootstrapcdn.com/bootstrap/3.3.5/js/bootstrap.min.js"></script>
<script src="../bower_components/bootstrap/dist/js/bootstrap.min.js"></script>
<script src="../bower_components/google-code-prettify/src/prettify.js"></script>
<script src="../src/bootstrap-wysiwyg.js"></script>
<script type='text/javascript'>
$('#editor').wysiwyg();

$(".dropdown-menu > input").click(function (e) {
e.stopPropagation();
});
Expand Down
22 changes: 11 additions & 11 deletions examples/multiple-editors.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>A tiny, opensource, Bootstrap WYSIWYG rich text editor</title>
<link href="../bower_components/google-code-prettify/src/prettify.css" rel="stylesheet" />
<link rel="stylesheet" href="http://netdna.bootstrapcdn.com/bootstrap/3.3.5/css/bootstrap.min.css" />
<link href="http://netdna.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.css" rel="stylesheet" />
<link href="../css/style.css" rel="stylesheet" />
<link href="../bower_components/bootstrap/dist/css/bootstrap.min.css" rel="stylesheet" />
<link href="../bower_components/fontawesome/css/font-awesome.min.css" rel="stylesheet" />
<link href="./css/style.css" rel="stylesheet" />
</head>

<body>
Expand Down Expand Up @@ -63,9 +63,9 @@ <h3>First Editor</h3>
</div>
<div class="btn-group">
<a class="btn btn-default" data-edit="unlink" title="Remove Hyperlink"><i class="fa fa-unlink"></i></a>
<span class="btn btn-default" title="Insert picture (or just drag & drop)" id="picBtn"> <i class="fa fa-picture-o"></i>
<input class="imgUpload" type="file" data-role="magic-overlay" data-target="#picBtn" data-edit="insertImage" />
</span>
<a id="picBtn" class="btn btn-default" title="Insert picture (or just drag & drop)" onclick="$('#pictureBtn').click();"><i class="fa fa-picture-o"></i></a>

<input id="pictureBtn" class="imgUpload" type="file" data-edit="insertImage" data-role="magic-overlay" />
</div>
<div class="btn-group">
<a class="btn btn-default" data-edit="undo" title="Undo (Ctrl/Cmd+Z)"><i class="fa fa-undo"></i></a>
Expand Down Expand Up @@ -125,9 +125,9 @@ <h3>Second Editor</h3>
</div>
<div class="btn-group">
<a class="btn btn-default" data-edit="unlink" title="Remove Hyperlink"><i class="fa fa-unlink"></i></a>
<span class="btn btn-default" title="Insert picture (or just drag & drop)" id="pictureBtn"> <i class="fa fa-picture-o"></i>
<input class="imgUpload" type="file" data-role="magic-overlay" data-target="#pictureBtn" data-edit="insertImage" />
</span>
<a id="picBtn" class="btn btn-default" title="Insert picture (or just drag & drop)" onclick="$('#picBtn').click();"><i class="fa fa-picture-o"></i></a>

<input id="picBtn" class="imgUpload" type="file" data-edit="insertImage" data-role="magic-overlay" />
</div>
<div class="btn-group">
<a class="btn btn-default" data-edit="undo" title="Undo (Ctrl/Cmd+Z)"><i class="fa fa-undo"></i></a>
Expand All @@ -139,9 +139,9 @@ <h3>Second Editor</h3>
<div class="editorPreview"></div>
</div>

<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.11.0/jquery.min.js"></script>
<script src="../bower_components/jquery/dist/jquery.min.js"></script>
<script src="../bower_components/jquery.hotkeys/jquery.hotkeys.js"></script>
<script src="http://netdna.bootstrapcdn.com/bootstrap/3.3.5/js/bootstrap.min.js"></script>
<script src="../bower_components/bootstrap/dist/js/bootstrap.min.js"></script>
<script src="../bower_components/google-code-prettify/src/prettify.js"></script>
<script src="../src/bootstrap-wysiwyg.js"></script>
<script type='text/javascript'>
Expand Down
Loading