diff --git a/Gruntfile.js b/Gruntfile.js index 11f31c8..57e7aa8 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -39,9 +39,18 @@ module.exports = function (grunt) '<%= paths.dest.templates %>' ], + // Concat JavaScript that has already been minified (because Uglify mangles Prototype.js) + concat: { + dist: { + src: ['<%= paths.src.js %>lib/prototype.min.js', '<%= paths.src.js %>lib/try.min.js'], + dest: '<%= paths.dest.js %>try.js', + } + }, + // Run some tasks in parallel to speed up the build process. concurrent: { dist: [ + 'concat', 'copy', 'css', 'jshint' @@ -218,11 +227,6 @@ module.exports = function (grunt) '<%= paths.src.js %>lib/controller.js', '<%= paths.src.js %>lib/converter.js' ], - - '<%= paths.dest.js %>try.js': [ - '<%= paths.src.js %>lib/prototype.min.js', - '<%= paths.src.js %>lib/try.js' - ], } ] } diff --git a/package.json b/package.json index 043a526..15f1010 100644 --- a/package.json +++ b/package.json @@ -17,6 +17,7 @@ "grunt-cli": "1.4.2", "grunt-concurrent": "3.0.0", "grunt-contrib-clean": "2.0.0", + "grunt-contrib-concat": "1.0.1", "grunt-contrib-copy": "1.0.0", "grunt-contrib-jshint": "3.0.0", "grunt-contrib-watch": "1.1.0", diff --git a/src/assets/js/lib/try.min.js b/src/assets/js/lib/try.min.js new file mode 100644 index 0000000..31c95c4 --- /dev/null +++ b/src/assets/js/lib/try.min.js @@ -0,0 +1 @@ +var TryTextileObserver=Class.create({initialize:function(e,t,s){this.observable=$(e),this.resultElement=$(t),this.htmlResultElement=$(s),this.initObserver()},initObserver:function(){new Form.Element.Observer(this.observable,.2,this.parseTextile.bind(this))},parseTextile:function(e){var s=this,t=s.observable.form.action;t.blank()&&(t="/"),new Ajax.Request(t,{parameters:{text:s.observable.value},onSuccess:function(e){var t=e.responseText.evalJSON();s.resultElement.update(t.response),s.htmlResultElement.update(t.response.escapeHTML())}})}});document.observe("dom:loaded",function(){new TryTextileObserver("text_in","result","html-result").parseTextile()});