Skip to content

Commit

Permalink
shuffle the tinymce.js demo
Browse files Browse the repository at this point in the history
  • Loading branch information
Jeff Collins committed Dec 21, 2014
1 parent 2d9d97a commit 6e47362
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 3 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,5 @@ bower_components
*.sublime-project

src/templates.js

ment.io/tinymce.js
9 changes: 7 additions & 2 deletions gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ var bump = require('gulp-bump');
*/
gulp.task('default', ['site']);

gulp.task('site', ['dist'], function () {
gulp.task('site', ['copy', 'dist'], function () {
var express = require('express');
var app = express();

Expand Down Expand Up @@ -77,6 +77,11 @@ gulp.task('tpl', function () {
.pipe(gulp.dest('src'));
});

gulp.task('copy', function() {
gulp.src(['bower_components/angular-ui-tinymce/src/tinymce.js'])
.pipe(gulp.dest('ment.io'))
});

// Basic usage:
// Will patch the version
gulp.task('bump', function(){
Expand Down Expand Up @@ -108,7 +113,7 @@ function testTask (params) {
/**
* Run the karma spec tests
*/
gulp.task('test', ['dist'], function () {
gulp.task('test', ['copy', 'dist'], function () {
testTask({
isWatch: gutil.env.hasOwnProperty('watch')
});
Expand Down
2 changes: 1 addition & 1 deletion ment.io/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<script src="//tinymce.cachefly.net/4.1/tinymce.min.js"></script>
<script src="/dist/mentio.js"></script>
<script src="scripts.js"></script>
<script src="/bower_components/angular-ui-tinymce/src/tinymce.js"></script>
<script src="tinymce.js"></script>
</head>
<body ng-controller="mentio-demo-ctrl">
<div>
Expand Down

0 comments on commit 6e47362

Please sign in to comment.