Merge pull request #26 from ww24/develop

Add config file for theme selecting

README.md

@@ -22,6 +22,12 @@ How to build
 1. `npm start`
 1. open `example/index.html`
 
+Config
+------
+`config/default.yml`
+
+For example it can change the theme.
+
 Test
 ----
 1. install PhantomJS and Firefox

build/deps/mace-core.js

@@ -1,13 +1,17 @@
 
 /*!
- * Mace 0.1.2
- * copyright: Takenori Nakagawa
- * license: MIT
+ * Mace 0.1.3
+ * https://github.com/ww24/mace
+ *
+ * Copyright (c) 2014 Takenori Nakagawa
+ * Licensed under the MIT license.
  */
 
 (function() {
   "use strict";
-  var Mace;
+  var Mace, ace_theme;
+
+  ace_theme = "monokai";
 
   Mace = (function() {
     function Mace(editor, preview, options) {
@@ -23,7 +27,7 @@
       };
       this.ace = ace.edit(this.editor);
       this.ace.getSession().setMode("ace/mode/markdown");
-      this.ace.setTheme("ace/theme/monokai");
+      this.ace.setTheme("ace/theme/" + ace_theme);
       marked.setOptions({
         renderer: new marked.Renderer(),
         gfm: true,

config/default.yml

@@ -0,0 +1,2 @@
+ace:
+  theme: monokai

gulpfile.js

@@ -2,18 +2,21 @@
  * Gulp build script
  */
 
+var gulp = require("gulp"),
+    plug = require("gulp-load-plugins")(),
+    del = require("del"),
+    config = require("config");
+
 var ace_deps = [
   "ace.js",
-  "mode-markdown.js",
-  "theme-monokai.js"
+  "mode-markdown.js"
 ];
 
-var gulp = require("gulp"),
-    plug = require("gulp-load-plugins")(),
-    del = require("del");
+// set ace theme
+ace_deps.push("theme-" + config.ace.theme + ".js");
 
 ace_deps = ace_deps.map(function (file) {
-  return "ace/build/src-min-noconflict/" + file;
+  return "ace/build/src-noconflict/" + file;
 });
 
 gulp.task("clean", function (done) {
@@ -22,6 +25,7 @@ gulp.task("clean", function (done) {
 
 gulp.task("mace", function () {
   return gulp.src("src/*.coffee")
+    .pipe(plug.replace("((\"monokai\"))", "\"" + config.ace.theme + "\""))
     .pipe(plug.coffee())
     .pipe(plug.concat("mace-core.js"))
     .pipe(gulp.dest("build/deps"))
@@ -33,6 +37,10 @@ gulp.task("mace", function () {
 gulp.task("ace", function () {
   return gulp.src(ace_deps)
     .pipe(plug.insert.append(";"))
+    .pipe(plug.uglify({preserveComments: function (node, comment) {
+      // check license comment
+      return !!~ comment.value.indexOf("license");
+    }}))
     .pipe(plug.concat("ace.min.js"))
     .pipe(gulp.dest("build/deps"));
 });

package.json

@@ -1,6 +1,6 @@
 {
   "name": "mace",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "description": "Mace = Markdown editor powered by Ace.",
   "main": "gulpfile.js",
   "scripts": {
@@ -22,15 +22,18 @@
   "homepage": "http://ww24.info/mace",
   "devDependencies": {
     "chai": "^1.9.2",
+    "config": "^1.9.0",
     "coveralls": "^2.11.2",
     "del": "^0.1.3",
     "gulp": "^3.8.8",
     "gulp-coffee": "^2.2.0",
     "gulp-concat": "^2.4.1",
     "gulp-insert": "^0.4.0",
     "gulp-load-plugins": "^0.7.0",
+    "gulp-replace": "^0.5.0",
     "gulp-uglify": "^1.0.1",
     "istanbul": "^0.3.2",
+    "js-yaml": "^3.2.4",
     "karma": "^0.12.24",
     "karma-coverage": "^0.2.6",
     "karma-mocha": "^0.1.9",

src/mace.coffee

@@ -1,11 +1,15 @@
 ###!
-# Mace 0.1.2
-# copyright: Takenori Nakagawa
-# license: MIT
+# Mace 0.1.3
+# https://github.com/ww24/mace
+#
+# Copyright (c) 2014 Takenori Nakagawa
+# Licensed under the MIT license.
 ###
 
 "use strict"
 
+ace_theme = (("monokai"))
+
 ## new mace(DOMElement editor, DOMElement preview[, options])
 class Mace
   constructor: (@editor, @preview = null, options = {}) ->
@@ -18,7 +22,7 @@ class Mace
     ## ace settings
     @ace = ace.edit @editor
     @ace.getSession().setMode "ace/mode/markdown"
-    @ace.setTheme "ace/theme/monokai"
+    @ace.setTheme "ace/theme/#{ace_theme}"
 
     ## marked settings
     marked.setOptions