Merge pull request #45 from frmendes/development

Adds Gulpfile and a few extra options

.gitignore

@@ -1 +1,2 @@
 localtesting/*
+node_modules/

gulpfile.js

@@ -0,0 +1,36 @@
+var gulp = require('gulp'),
+    minifycss = require('gulp-minify-css'),
+    uglify = require('gulp-uglify'),
+    concat = require('gulp-concat');
+
+gulp.task('scripts', function() {
+  var js_files = [
+    './src/js/codemirror/codemirror.js',
+    './src/js/codemirror/continuelist.js',
+    './src/js/codemirror/fullscreen.js',
+    './src/js/codemirror/markdown.js',
+    './src/js/codemirror/overlay.js',
+    './src/js/codemirror/gfm.js',
+    './src/js/codemirror/xml.js',
+    './src/js/typo.js',
+    './src/js/spell-checker.js',
+    './src/js/marked.js',
+    './src/js/simplemde.js'];
+
+  return gulp.src(js_files)
+    .pipe(concat('simplemde.min.js'))
+    .pipe(gulp.dest('dist'))
+    .pipe(uglify())
+    .pipe(gulp.dest('dist'));
+});
+
+gulp.task('styles', function() {
+  return gulp.src('./src/css/*.css')
+    .pipe(concat('simplemde.min.css'))
+    .pipe(gulp.dest('dist'))
+    .pipe(minifycss())
+    .pipe(gulp.dest('dist'));
+});
+
+gulp.task('default', ['scripts', 'styles']);
+

package.json

@@ -0,0 +1,14 @@
+{
+  "name" : "simplemde-markdown-editor",
+  "main" : "gulpfile.js",
+  "dependencies" : {
+    "gulp" : "*",
+    "gulp-minify-css" : "*",
+    "gulp-uglify" : "*",
+    "gulp-concat" : "*"
+  },
+  "repository" : {
+    "type" : "git",
+    "url" : "https://github.com/NextStepWebs/simplemde-markdown-editor"
+  }
+}

src/README.md

@@ -1,20 +0,0 @@
-# How to compile
-Minify the JS in this order:
-
-1. `codemirror/codemirror.js`
-1. `codemirror/continuelist.js`
-1. `codemirror/fullscreen.js`
-1. `codemirror/markdown.js`
-1. `codemirror/overlay.js`
-1. `codemirror/gfm.js`
-1. `codemirror/xml.js`
-1. `typo/typo.js`
-1. `spell-checker/spell-checker.js`
-1. `marked.js`
-1. `simplemde.js`
-
-Minify the CSS in this order:
-
-1. `codemirror/codemirror.css`
-1. `simplemde.css`
-1. `spell-checker/spell-checker.css`

src/js/simplemde.js

@@ -471,6 +471,13 @@ function SimpleMDE(options) {
 
 	// If user has passed an element, it should auto rendered
 	this.render();
+
+  // The codemirror component is only available after rendering
+  // so, the setter for the defaultValue can only run after
+  // the element has been rendered
+  if (options.defaultValue) {
+    this.value(options.defaultValue);
+  }
 }
 
 /**
@@ -724,11 +731,11 @@ SimpleMDE.prototype.createStatusbar = function(status) {
  * Get or set the text content.
  */
 SimpleMDE.prototype.value = function(val) {
-	if (val) {
+	if (val === undefined) {
+		return this.codemirror.getValue();
+	} else {
 		this.codemirror.getDoc().setValue(val);
 		return this;
-	} else {
-		return this.codemirror.getValue();
 	}
 };