aboutsummaryrefslogtreecommitdiff
path: root/js
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-02-27 14:39:10 -0800
committerJose Antonio Marquez2012-02-27 14:39:10 -0800
commit811d5092345bf520f6a683eec89cf7d8ed7aa490 (patch)
treeafab371792ef6e1871febe4bd12e6f3067521a35 /js
parentceba159acedcaada47f990392b3bbebc2025e40a (diff)
parentf872077e947916496235f4e871511ce890953d04 (diff)
downloadninja-811d5092345bf520f6a683eec89cf7d8ed7aa490.tar.gz
Merge branch 'refs/heads/FileIO' into FileIO-Build-Candidate
Diffstat (limited to 'js')
-rw-r--r--js/mediators/io-mediator.js19
1 files changed, 15 insertions, 4 deletions
diff --git a/js/mediators/io-mediator.js b/js/mediators/io-mediator.js
index 7efed29b..733e44b2 100644
--- a/js/mediators/io-mediator.js
+++ b/js/mediators/io-mediator.js
@@ -345,10 +345,21 @@ exports.IoMediator = Montage.create(Component, {
345 //////////////////////////////////////////////////////////////////// 345 ////////////////////////////////////////////////////////////////////
346 //Pretty methods (minified) 346 //Pretty methods (minified)
347 /* 347 /*
348 is-beautify javascript code courtesy of Einar Lielmanis: 348 is-beautify javascript code courtesy of Einar Lielmanis:
349 Code from https://github.com/einars/js-beautify 349 Code from https://github.com/einars/js-beautify
350 License https://github.com/einars/js-beautify/blob/master/license.txt 350 License https://github.com/einars/js-beautify/blob/master/license.txt
351 Used with author's permission 351 Used with author's permission, as stated below
352
353 Copyright (c) 2009 - 2011, Einar Lielmanis
354 Permission is hereby granted, free of charge, to any person
355 obtaining a copy of this software and associated documentation
356 files (the "Software"), to deal in the Software without
357 restriction, including without limitation the rights to use,
358 copy, modify, merge, publish, distribute, sublicense, and/or sell
359 copies of the Software, and to permit persons to whom the
360 Software is furnished to do so, subject to the following
361 conditions:The above copyright notice and this permission notice shall be
362 included in all copies or substantial portions of the Software.
352 */ 363 */
353 //For HTML, including any JS or CSS (single string/file) 364 //For HTML, including any JS or CSS (single string/file)
354 getPrettyHtml: { 365 getPrettyHtml: {