gollum 3.1.2 → 3.1.3

data/lib/gollum/public/gollum/livepreview/js/ace/lib/ace/snippets/yaml.js

@@ -0,0 +1,7 @@
+define(function(require, exports, module) {
+"use strict";
+
+exports.snippetText = require("../requirejs/text!./yaml.snippets");
+exports.scope = "yaml";
+
+});

data/lib/gollum/public/gollum/livepreview/js/ace/lib/ace/snippets_test.js

@@ -0,0 +1,131 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Distributed under the BSD license:
+ *
+ * Copyright (c) 2010, Ajax.org B.V.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of Ajax.org B.V. nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL AJAX.ORG B.V. BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+if (typeof process !== "undefined") {
+    require("amd-loader");
+}
+
+define(function(require, exports, module) {
+"use strict";
+var EditSession = require("./edit_session").EditSession;
+var Editor = require("./editor").Editor;
+var MockRenderer = require("./test/mockrenderer").MockRenderer;
+var MultiSelect = require("./multi_select").MultiSelect;
+
+var snippetManager = require("./snippets").snippetManager;
+var assert = require("./test/assertions");
+
+module.exports = {
+    setUp : function(next) {
+        this.editor = new Editor(new MockRenderer());
+        next();
+    },
+    
+    "test: textmate style format strings" : function() {
+        var fmt = snippetManager.tmStrFormat;
+        snippetManager.tmStrFormat("hello", {
+            guard: "(..)(.)(.)",
+            flag:"g",
+            fmt: "a\\UO\\l$1\\E$2"
+        }) == "aOHElo";
+    },
+    "test: parse snipmate file" : function() {
+        var expected = [{
+            name: "a",
+            guard: "(?:(=)|(:))?s*)",
+            trigger: "\\(?f",
+            endTrigger: "\\)",
+			endGuard: "",
+            content: "{$0}\n"
+         }, {
+            tabTrigger: "f",
+            name: "f function",
+            content: "function"
+        }];
+		
+		
+		
+        var parsed = snippetManager.parseSnippetFile(
+            "name a\nregex /(?:(=)|(:))?\s*)/\\(?f/\\)/\n\t{$0}" +
+            "\n\t\n\n#function\nsnippet f function\n\tfunction"
+        );
+
+        assert.equal(JSON.stringify(expected, null, 4), JSON.stringify(parsed, null, 4))
+    },
+    "test: parse snippet": function() {
+        var content = "-\\$$2a${1:x${$2:y$3\\}\\n\\}$TM_SELECTION}";
+        var tokens = snippetManager.tokenizeTmSnippet(content);
+        assert.equal(tokens.length, 15);
+        assert.equal(tokens[4], tokens[14]);
+        assert.equal(tokens[2].tabstopId, 2);
+
+        var content = "\\}${var/as\\/d/\\ul\\//g:s}"
+        var tokens = snippetManager.tokenizeTmSnippet(content);
+        assert.equal(tokens.length, 4);
+        assert.equal(tokens[1], tokens[3]);
+        assert.equal(tokens[2], "s");
+        assert.equal(tokens[1].text, "var");
+        assert.equal(tokens[1].fmt, "\\ul\\/");
+        assert.equal(tokens[1].guard, "as\\/d");
+        assert.equal(tokens[1].flag, "g");
+    },
+    "test: expand snippet with nested tabstops": function() {
+        var content = "-${1}-${1:1}--${2:2 ${3} 2}-${3:3 $1 3}-${4:4 $2 4}";
+        this.editor.setValue("");
+        snippetManager.insertSnippet(this.editor, content);
+        assert.equal(this.editor.getValue(), "-1-1--2 3 1 3 2-3 1 3-4 2 3 1 3 2 4");
+        
+        assert.equal(this.editor.getSelectedText(), "1\n1\n1\n1\n1");
+        this.editor.tabstopManager.tabNext();
+        assert.equal(this.editor.getSelectedText(), "2 3 1 3 2\n2 3 1 3 2");
+        this.editor.tabstopManager.tabNext();
+        assert.equal(this.editor.getSelectedText(), "3 1 3\n3 1 3\n3 1 3");
+        this.editor.tabstopManager.tabNext();
+        assert.equal(this.editor.getSelectedText(), "4 2 3 1 3 2 4");
+        this.editor.tabstopManager.tabNext();
+        assert.equal(this.editor.getSelectedText(), "");
+        
+        this.editor.setValue("");
+        snippetManager.insertSnippet(this.editor, "-${1:a$2}-${2:b$1}");
+        assert.equal(this.editor.getValue(), "-ab-ba");
+        
+        assert.equal(this.editor.getSelectedText(), "ab\na");
+        this.editor.tabstopManager.tabNext();
+        assert.equal(this.editor.getSelectedText(), "b\nba");
+        this.editor.tabstopManager.tabNext();
+        assert.equal(this.editor.getSelectedText(), "");
+    }
+};
+
+});
+
+if (typeof module !== "undefined" && module === require.main) {
+    require("asyncjs").test.testcase(module.exports).exec()
+}

data/lib/gollum/public/gollum/livepreview/js/ace/lib/ace/split.js

@@ -224,7 +224,7 @@ var Split = function(container, theme, splits) {
 
         // Overwrite the default $informUndoManager function such that new delas
         // aren't added to the undo manager from the new and the old session.
-        s.$informUndoManager = lang.deferredCall(function() { s.$deltas = []; });
+        s.$informUndoManager = lang.delayedCall(function() { s.$deltas = []; });
 
         // Copy over 'settings' from the session.
         s.setTabSize(session.getTabSize());
@@ -277,7 +277,7 @@ var Split = function(container, theme, splits) {
    /** 
      * 
      * Returns the orientation.
-     * @returns Number
+     * @returns {Number}
      **/
     this.getOrientation = function() {
         return this.$orientation;
@@ -285,9 +285,9 @@ var Split = function(container, theme, splits) {
 
    /** 
      * 
+     * Sets the orientation.
      * @param {Number} orientation The new orientation value
      *
-     * Sets the orientation.
      *
      **/
     this.setOrientation = function(orientation) {

data/lib/gollum/public/gollum/livepreview/js/ace/lib/ace/test/all_browser.js

@@ -13,6 +13,7 @@ var testNames = [
     "ace/anchor_test",
     "ace/background_tokenizer_test",
     "ace/commands/command_manager_test",
+    "ace/config_test",
     "ace/document_test",
     "ace/edit_session_test",
     "ace/editor_change_document_test",
@@ -20,36 +21,40 @@ var testNames = [
     "ace/editor_navigation_test",
     "ace/editor_text_edit_test",
     "ace/ext/static_highlight_test",
+    "ace/incremental_search_test",
+    "ace/keyboard/emacs_test",
+    "ace/keyboard/keybinding_test",
+    "ace/keyboard/vim_test",
     "ace/layer/text_test",
     "ace/lib/event_emitter_test",
     "ace/mode/coffee/parser_test",
-    "ace/mode/coffee_highlight_rules_test",
     "ace/mode/coldfusion_test",
     "ace/mode/css_test",
-    "ace/mode/css_highlight_rules_test",
     "ace/mode/css_worker",
     "ace/mode/html_test",
-    "ace/mode/html_highlight_rules_test",
     "ace/mode/javascript_test",
-    "ace/mode/javascript_highlight_rules_test",
     "ace/mode/javascript_worker_test",
-    "ace/mode/lucene_highlight_rules_test",
+    "ace/mode/logiql_test",
     "ace/mode/python_test",
-    "ace/mode/ruby_highlight_rules_test",
     "ace/mode/text_test",
     "ace/mode/xml_test",
-    "ace/mode/xml_highlight_rules_test",
     "ace/mode/folding/cstyle_test",
     "ace/mode/folding/html_test",
     "ace/mode/folding/pythonic_test",
     "ace/mode/folding/xml_test",
     "ace/mode/folding/coffee_test",
+    "ace/mode/behaviour/behaviour_test",
     "ace/multi_select_test",
+    "ace/mouse/mouse_handler_test",
+    "ace/occur_test",
+    "ace/placeholder_test",
     "ace/range_test",
     "ace/range_list_test",
     "ace/search_test",
     "ace/selection_test",
+    "ace/snippets_test",
     "ace/token_iterator_test",
+    "ace/tokenizer_test",
     "ace/virtual_renderer_test"
 ];
 
@@ -67,6 +72,8 @@ document.body.appendChild(nav);
 if (location.search)
     testNames = location.search.substr(1).split(",")
 
+var filter = location.hash.substr(1);
+
 require(testNames, function() {
     var tests = testNames.map(function(x) {
         var module = require(x);
@@ -76,6 +83,12 @@ require(testNames, function() {
 
     async.list(tests)
         .expand(function(test) {
+            if (filter) {
+                Object.keys(test).forEach(function(method) {
+                    if (method.match(/^>?test/) && !method.match(filter))
+                        test[method] = undefined;
+                });
+            }
             return AsyncTest.testcase(test)
         }, AsyncTest.TestGenerator)
         .run()

data/lib/gollum/public/gollum/livepreview/js/ace/lib/ace/test/asyncjs/assert.js

@@ -1,5 +1,5 @@
 define(function(require, exports, module) {
-    
+
 // http://wiki.commonjs.org/wiki/Unit_Testing/1.0
 //
 // THIS IS NOT TESTED NOR LIKELY TO WORK OUTSIDE V8!
@@ -141,7 +141,7 @@ function _deepEqual(actual, expected) {
   if (actual === expected) {
     return true;
 
-  } else if (Buffer.isBuffer(actual) && Buffer.isBuffer(expected)) {
+  } else if (typeof Buffer !== "undefined" && Buffer.isBuffer(actual) && Buffer.isBuffer(expected)) {
     if (actual.length != expected.length) return false;
 
     for (var i = 0; i < actual.length; i++) {

data/lib/gollum/public/gollum/livepreview/js/ace/lib/ace/test/mockrenderer.js

@@ -33,6 +33,7 @@ define(function(require, exports, module) {
 
 var MockRenderer = exports.MockRenderer = function(visibleRowCount) {
     this.container = document.createElement("div");
+    this.scroller = document.createElement("div");
     this.visibleRowCount = visibleRowCount || 20;
 
     this.layerConfig = {
@@ -193,6 +194,13 @@ MockRenderer.prototype.textToScreenCoordinates = function() {
     }
 };
 
+MockRenderer.prototype.screenToTextCoordinates = function() {
+    return {
+        row: 0,
+        column: 0
+    }
+};
+
 MockRenderer.prototype.adjustWrapLimit = function () {
 
 };

data/lib/gollum/public/gollum/livepreview/js/ace/lib/ace/theme/ambiance.css

@@ -16,6 +16,10 @@
   background: repeat left top;
 }
 
+.ace-ambiance .ace_gutter-active-line {
+  background-color: #3F3F3F;
+}
+
 .ace-ambiance .ace_fold-widget {
   text-align: center;
 }
@@ -51,15 +55,15 @@
 }
 
 .ace-ambiance .ace_scroller {
-  background-color: #202020;
   -webkit-box-shadow: inset 0 0 10px black;
   -moz-box-shadow: inset 0 0 10px black;
   -o-box-shadow: inset 0 0 10px black;
   box-shadow: inset 0 0 10px black;
 }
 
-.ace-ambiance .ace_text-layer {
+.ace-ambiance {
   color: #E6E1DC;
+  background-color: #202020;
 }
 
 .ace-ambiance .ace_cursor {

data/lib/gollum/public/gollum/livepreview/js/ace/lib/ace/theme/chaos.css

@@ -0,0 +1,154 @@
+.ace-chaos .ace_gutter {
+  background: #141414;
+  color: #595959;
+  border-right: 1px solid #282828;
+}
+.ace-chaos .ace_gutter-cell.ace_warning {
+  background-image: none;
+  background: #FC0;
+  border-left: none;
+  padding-left: 0;
+  color: #000;
+}
+.ace-chaos .ace_gutter-cell.ace_error {
+  background-position: -6px center;
+  background-image: none;
+  background: #F10;
+  border-left: none;
+  padding-left: 0;
+  color: #000;
+}
+.ace-chaos .ace_print-margin {
+  border-left: 1px solid #555;
+  right: 0;
+  background: #1D1D1D;
+}
+.ace-chaos {
+  background-color: #161616;
+  color: #E6E1DC;
+}
+
+.ace-chaos .ace_cursor {
+  border-left: 2px solid #FFFFFF;
+}
+.ace-chaos .ace_cursor.ace_overwrite {
+  border-left: 0px;
+  border-bottom: 1px solid #FFFFFF;
+}
+.ace-chaos .ace_marker-layer .ace_selection {
+  background: #494836;
+}
+.ace-chaos .ace_marker-layer .ace_step {
+  background: rgb(198, 219, 174);
+}
+.ace-chaos .ace_marker-layer .ace_bracket {
+  margin: -1px 0 0 -1px;
+  border: 1px solid #FCE94F;
+}
+.ace-chaos .ace_marker-layer .ace_active-line {
+  background: #333;
+}
+.ace-chaos .ace_gutter-active-line {
+  background-color: #222;
+}
+.ace-chaos .ace_invisible {
+  color: #404040;
+}
+.ace-chaos .ace_keyword {
+  color:#00698F;
+}
+.ace-chaos .ace_keyword.ace_operator {
+  color:#FF308F;
+}
+.ace-chaos .ace_constant {
+  color:#1EDAFB;
+}
+.ace-chaos .ace_constant.ace_language {
+  color:#FDC251;
+}
+.ace-chaos .ace_constant.ace_library {
+  color:#8DFF0A;
+}
+.ace-chaos .ace_constant.ace_numeric {
+  color:#58C554;
+}
+.ace-chaos .ace_invalid {
+  color:#FFFFFF;
+  background-color:#990000;
+}
+.ace-chaos .ace_invalid.ace_deprecated {
+  color:#FFFFFF;
+  background-color:#990000;
+}
+.ace-chaos .ace_support {
+  color: #999;
+}
+.ace-chaos .ace_support.ace_function {
+  color:#00AEEF;
+}
+.ace-chaos .ace_function {
+  color:#00AEEF;
+}
+.ace-chaos .ace_string {
+  color:#58C554;
+}
+.ace-chaos .ace_comment {
+  color:#555;
+  font-style:italic;
+  padding-bottom: 0px;
+}
+.ace-chaos .ace_variable {
+  color:#997744;
+}
+.ace-chaos .ace_meta.ace_tag {
+  color:#BE53E6;
+}
+.ace-chaos .ace_entity.ace_other.ace_attribute-name {
+  color:#FFFF89;
+}
+.ace-chaos .ace_markup.ace_underline {
+  text-decoration: underline;
+}
+.ace-chaos .ace_fold-widget {
+  text-align: center;
+}
+
+.ace-chaos .ace_fold-widget:hover {
+  color: #777;
+}
+
+.ace-chaos .ace_fold-widget.ace_start,
+.ace-chaos .ace_fold-widget.ace_end,
+.ace-chaos .ace_fold-widget.ace_closed{
+  background: none;
+  border: none;
+  box-shadow: none;
+}
+
+.ace-chaos .ace_fold-widget.ace_start:after {
+  content: '▾'
+}
+
+.ace-chaos .ace_fold-widget.ace_end:after {
+  content: '▴'
+}
+
+.ace-chaos .ace_fold-widget.ace_closed:after {
+  content: '‣'
+}
+
+.ace-chaos .ace_indent-guide {
+  border-right:1px dotted #333;
+  margin-right:-1px;
+}
+
+.ace-chaos .ace_fold { 
+  background: #222; 
+  border-radius: 3px; 
+  color: #7AF; 
+  border: none; 
+}
+.ace-chaos .ace_fold:hover {
+  background: #CCC; 
+  color: #000;
+}