erp_app 3.0.10 → 3.0.12

data/public/javascripts/erp_app/codemirror/test/mode_test.css

@@ -8,15 +8,3 @@
 .mt-output .mt-style {
   font-size: x-small;
 }
-
-.mt-test {
-  border-left: 10px solid #fff;
-}
-
-.mt-pass {
-  border-left: 10px solid #cfc;
-}
-
-.mt-fail {
-  border-left: 10px solid #fcc;
-}

data/public/javascripts/erp_app/codemirror/test/mode_test.js

@@ -10,33 +10,49 @@ ModeTest.modeOptions = {};
 ModeTest.modeName = CodeMirror.defaults.mode;
 
 /* keep track of results for printSummary */
-ModeTest.tests = 0;
+ModeTest.testCount = 0;
 ModeTest.passes = 0;
 
 /**
  * Run a test; prettyprints the results using document.write().
- *
- * @param string to highlight
- *
- * @param style[i] expected style of the i'th token in string
- *
- * @param token[i] expected value for the i'th token in string
+ * 
+ * @param name Name of test
+ * @param text String to highlight.
+ * @param expected Expected styles and tokens: Array(style, token, [style, token,...])
+ * @param modeName
+ * @param modeOptions
+ * @param expectedFail
  */
-ModeTest.test = function() {
-  ModeTest.tests += 1;
+ModeTest.testMode = function(name, text, expected, modeName, modeOptions, expectedFail) {
+  ModeTest.testCount += 1;
+  
+  if (!modeName) modeName = ModeTest.modeName;
+  
+  if (!modeOptions) modeOptions = ModeTest.modeOptions;
 
-  var mode = CodeMirror.getMode(ModeTest.modeOptions, ModeTest.modeName);
+  var mode = CodeMirror.getMode(modeOptions, modeName);
 
-  if (arguments.length < 1) {
-    throw "must have text for test";
+  if (expected.length < 0) {
+    throw "must have text for test (" + name + ")";
   }
-  if (arguments.length % 2 != 1) {
-    throw "must have text for test plus expected (style, token) pairs";
+  if (expected.length % 2 != 0) {
+    throw "must have text for test (" + name + ") plus expected (style, token) pairs";
   }
+  return test(
+    modeName + "_" + name,
+    function(){
+      return ModeTest.compare(text, expected, mode);
+    },
+    expectedFail
+  );
+  
+}
+
+ModeTest.compare = function (text, arguments, mode) {
 
-  var text = arguments[0];
   var expectedOutput = [];
-  for (var i = 1; i < arguments.length; i += 2) {
+  for (var i = 0; i < arguments.length; i += 2) {
+    arguments[i] = (arguments[i] != null ? arguments[i].split(' ').sort().join(' ') : arguments[i]);
     expectedOutput.push([arguments[i],arguments[i + 1]]);
   }
 
@@ -50,20 +66,26 @@ ModeTest.test = function() {
   }
 
   var s = '';
-  s += '<div class="mt-test ' + passStyle + '">';
-  s +=   '<pre>' + ModeTest.htmlEscape(text) + '</pre>';
-  s +=   '<div class="cm-s-default">';
   if (pass || expectedOutput.length == 0) {
+    s += '<div class="mt-test ' + passStyle + '">';
+    s +=   '<pre>' + ModeTest.htmlEscape(text) + '</pre>';
+    s +=   '<div class="cm-s-default">';
     s +=   ModeTest.prettyPrintOutputTable(observedOutput);
+    s +=   '</div>';
+    s += '</div>';
+    return s;
   } else {
+    s += '<div class="mt-test ' + passStyle + '">';
+    s +=   '<pre>' + ModeTest.htmlEscape(text) + '</pre>';
+    s +=   '<div class="cm-s-default">';
     s += 'expected:';
     s +=   ModeTest.prettyPrintOutputTable(expectedOutput);
     s += 'observed:';
     s +=   ModeTest.prettyPrintOutputTable(observedOutput);
+    s +=   '</div>';
+    s += '</div>';
+    throw s;
   }
-  s +=   '</div>';
-  s += '</div>';
-  document.write(s);
 }
 
 /**
@@ -85,11 +107,27 @@ ModeTest.highlight = function(string, mode) {
     var line = lines[i];
     var stream = new CodeMirror.StringStream(line);
     if (line == "" && mode.blankLine) mode.blankLine(state);
+    var pos = 0;
+    var st = [];
+    /* Start copied code from CodeMirror.highlight */
     while (!stream.eol()) {
-      var style = mode.token(stream, state);
-      var substr = line.slice(stream.start, stream.pos);
-      output.push([style, substr]);
+      var style = mode.token(stream, state), substr = stream.current();
       stream.start = stream.pos;
+      if (pos && st[pos-1] == style) {
+        st[pos-2] += substr;
+      } else if (substr) {
+        st[pos++] = substr; st[pos++] = style;
+      }
+      // Give up when line is ridiculously long
+      if (stream.pos > 5000) {
+        st[pos++] = this.text.slice(stream.pos); st[pos++] = null;
+        break;
+      }
+    }
+    /* End copied code from CodeMirror.highlight */
+    for (var x = 0; x < st.length; x += 2) {
+      st[x + 1] = (st[x + 1] != null ? st[x + 1].split(' ').sort().join(' ') : st[x + 1]);
+      output.push([st[x + 1], st[x]]);
     }
   }
 
@@ -131,7 +169,7 @@ ModeTest.prettyPrintOutputTable = function(output) {
     var token = output[i];
     s +=
       '<td class="mt-token">' +
-        '<span class="cm-' + token[0] + '">' +
+        '<span class="cm-' + String(token[0]).replace(/ +/g, " cm-") + '">' +
           ModeTest.htmlEscape(token[1]).replace(/ /g,'&middot;') +
         '</span>' +
       '</td>';
@@ -150,7 +188,8 @@ ModeTest.prettyPrintOutputTable = function(output) {
  * Print how many tests have run so far and how many of those passed.
  */
 ModeTest.printSummary = function() {
-  document.write(ModeTest.passes + ' passes for ' + ModeTest.tests + ' tests');
+  ModeTest.runTests(ModeTest.displayTest);
+  document.write(ModeTest.passes + ' passes for ' + ModeTest.testCount + ' tests');
 }
 
 /**

data/public/javascripts/erp_app/codemirror/test/phantom_driver.js

@@ -0,0 +1,30 @@
+var page = require('webpage').create();
+
+page.open("http://localhost:3000/test/index.html", function (status) {
+  if (status != "success") {
+    console.log("page couldn't be loaded successfully");
+    phantom.exit(1);
+  }
+  waitFor(function () {
+    return page.evaluate(function () {
+      var output = document.getElementById('status');
+      if (!output) { return false; }
+      return (/^(\d+ failures?|all passed)/i).test(output.innerText);
+    });
+  }, function () {
+    var failed = page.evaluate(function () { return window.failed; });
+    var output = page.evaluate(function () {
+      return document.getElementById('status').innerText;
+    });
+    console.log(output);
+    phantom.exit(failed > 0 ? 1 : 0);
+  });
+});
+
+function waitFor (test, cb) {
+  if (test()) {
+    cb();
+  } else {
+    setTimeout(function () { waitFor(test, cb); }, 250);
+  }
+}

data/public/javascripts/erp_app/codemirror/test/run.js

@@ -0,0 +1,32 @@
+#!/usr/bin/env node
+
+var lint = require("./lint/lint");
+
+lint.checkDir("mode");
+lint.checkDir("lib");
+
+var ok = lint.success();
+
+var files = new (require('node-static').Server)('.');
+
+var server = require('http').createServer(function (req, res) {
+  req.addListener('end', function () {
+    files.serve(req, res);
+  });
+}).addListener('error', function (err) {
+  throw err;
+}).listen(3000, function () {
+  var child_process = require('child_process');
+  child_process.exec("which phantomjs", function (err) {
+    if (err) {
+      console.error("PhantomJS is not installed. Download from http://phantomjs.org");
+      process.exit(1);
+    }
+    var cmd = 'phantomjs test/phantom_driver.js';
+    child_process.exec(cmd, function (err, stdout) {
+      server.close();
+      console.log(stdout);
+      process.exit(err || !ok ? 1 : 0);
+    });
+  });
+});

data/public/javascripts/erp_app/codemirror/test/test.js

@@ -22,7 +22,9 @@ function byClassName(elt, cls) {
   return found;
 }
 
-test("fromTextArea", function() {
+var ie_lt8 = /MSIE [1-7]\b/.test(navigator.userAgent);
+
+test("core_fromTextArea", function() {
   var te = document.getElementById("code");
   te.value = "CONTENT";
   var cm = CodeMirror.fromTextArea(te);
@@ -100,9 +102,13 @@ testCM("indent", function(cm) {
   cm.setOption("indentUnit", 8);
   cm.indentLine(1);
   eq(cm.getLine(1), "\tblah();");
+  cm.setOption("indentUnit", 10);
+  cm.setOption("tabSize", 4);
+  cm.indentLine(1);
+  eq(cm.getLine(1), "\t\t  blah();");
 }, {value: "if (x) {\nblah();\n}", indentUnit: 3, indentWithTabs: true, tabSize: 8});
 
-test("defaults", function() {
+test("core_defaults", function() {
   var olddefaults = CodeMirror.defaults, defs = CodeMirror.defaults = {};
   for (var opt in olddefaults) defs[opt] = olddefaults[opt];
   defs.indentUnit = 5;
@@ -251,13 +257,14 @@ testCM("markTextSingleLine", function(cm) {
     var r = cm.markText({line: 0, ch: 3}, {line: 0, ch: 6}, "foo");
     cm.replaceRange(test.c, {line: 0, ch: test.a}, {line: 0, ch: test.b});
     var f = r.find();
-    eq(f.from && f.from.ch, test.f); eq(f.to && f.to.ch, test.t);
+    eq(f && f.from.ch, test.f); eq(f && f.to.ch, test.t);
   });
 });
 
 testCM("markTextMultiLine", function(cm) {
   function p(v) { return v && {line: v[0], ch: v[1]}; }
   forEach([{a: [0, 0], b: [0, 5], c: "", f: [0, 0], t: [2, 5]},
+           {a: [0, 0], b: [0, 5], c: "foo\n", f: [1, 0], t: [3, 5]},
            {a: [0, 1], b: [0, 10], c: "", f: [0, 1], t: [2, 5]},
            {a: [0, 5], b: [0, 6], c: "x", f: [0, 6], t: [2, 5]},
            {a: [0, 0], b: [1, 0], c: "", f: [0, 0], t: [1, 5]},
@@ -269,16 +276,33 @@ testCM("markTextMultiLine", function(cm) {
            {a: [1, 5], b: [2, 5], c: "", f: [0, 5], t: [1, 5]},
            {a: [2, 0], b: [2, 3], c: "", f: [0, 5], t: [2, 2]},
            {a: [2, 5], b: [3, 0], c: "a\nb", f: [0, 5], t: [2, 5]},
-           {a: [2, 3], b: [3, 0], c: "x", f: [0, 5], t: [2, 4]},
+           {a: [2, 3], b: [3, 0], c: "x", f: [0, 5], t: [2, 3]},
            {a: [1, 1], b: [1, 9], c: "1\n2\n3", f: [0, 5], t: [4, 5]}], function(test) {
     cm.setValue("aaaaaaaaaa\nbbbbbbbbbb\ncccccccccc\ndddddddd\n");
-    var r = cm.markText({line: 0, ch: 5}, {line: 2, ch: 5}, "foo");
+    var r = cm.markText({line: 0, ch: 5}, {line: 2, ch: 5}, "CodeMirror-matchingbracket");
     cm.replaceRange(test.c, p(test.a), p(test.b));
     var f = r.find();
-    eqPos(f.from, p(test.f)); eqPos(f.to, p(test.t));
+    eqPos(f && f.from, p(test.f)); eqPos(f && f.to, p(test.t));
   });
 });
 
+testCM("markTextUndo", function(cm) {
+  var marker1 = cm.markText({line: 0, ch: 1}, {line: 0, ch: 3}, "CodeMirror-matchingbracket");
+  var marker2 = cm.markText({line: 0, ch: 0}, {line: 2, ch: 1}, "CodeMirror-matchingbracket");
+  var bookmark = cm.setBookmark({line: 1, ch: 5});
+  cm.replaceRange("foo", {line: 0, ch: 2});
+  cm.replaceRange("bar\baz\bug\n", {line: 2, ch: 0}, {line: 3, ch: 0});
+  cm.setValue("");
+  eq(marker1.find(), null); eq(marker2.find(), null); eq(bookmark.find(), null);
+  cm.undo();
+  eqPos(bookmark.find(), {line: 1, ch: 5});
+  cm.undo(); cm.undo();
+  var m1Pos = marker1.find(), m2Pos = marker2.find();
+  eqPos(m1Pos.from, {line: 0, ch: 1}); eqPos(m1Pos.to, {line: 0, ch: 3});
+  eqPos(m2Pos.from, {line: 0, ch: 0}); eqPos(m2Pos.to, {line: 2, ch: 1});
+  eqPos(bookmark.find(), {line: 1, ch: 5});
+}, {value: "1234\n56789\n00\n"});
+
 testCM("markClearBetween", function(cm) {
   cm.setValue("aaa\nbbb\nccc\nddd\n");
   cm.markText({line: 0, ch: 0}, {line: 2}, "foo");
@@ -322,7 +346,7 @@ testCM("scrollSnap", function(cm) {
   cm.setCursor({line: 100, ch: 180});
   cm.setCursor({line: 199, ch: 0});
   info = cm.getScrollInfo();
-  is(info.x == 0 && info.y == info.height - 100, "scrolled clean to bottom");
+  is(info.x == 0 && info.y > info.height - 100, "scrolled clean to bottom");
 });
 
 testCM("selectionPos", function(cm) {
@@ -357,7 +381,7 @@ testCM("selectionPos", function(cm) {
     }
   }
   is(sawTop && sawBottom && sawMiddle, "all parts");
-});
+}, null, ie_lt8);
 
 testCM("restoreHistory", function(cm) {
   cm.setValue("abc\ndef");
@@ -464,4 +488,185 @@ testCM("wrappingAndResizing", function(cm) {
     var coords = cm.charCoords(pos);
     eqPos(pos, cm.coordsChar({x: coords.x + 2, y: coords.y + 2}));
   });
+}, null, ie_lt8);
+
+testCM("measureEndOfLine", function(cm) {
+  cm.setSize(null, "auto");
+  var inner = byClassName(cm.getWrapperElement(), "CodeMirror-lines")[0].firstChild;
+  var w = 20, lh = inner.offsetHeight;
+  for (var step = 10;; w += step) {
+    cm.setSize(w);
+    if (inner.offsetHeight < 2.5 * lh) {
+      if (step == 10) { w -= 10; step = 1; }
+      else { break; }
+    }
+  }
+  cm.setValue(cm.getValue() + "\n\n");
+  var endPos = cm.charCoords({line: 0, ch: 18}, "local");
+  is(endPos.y > lh * .8, "not at top");
+  is(endPos.x > w - 20, "not at right");
+  endPos = cm.charCoords({line: 0, ch: 18});
+  eqPos(cm.coordsChar({x: endPos.x, y: endPos.y + 2}), {line: 0, ch: 18});
+}, {mode: "text/html", value: "<!-- foo barrr -->", lineWrapping: true}, ie_lt8);
+
+testCM("scrollVerticallyAndHorizontally", function(cm) {
+  cm.setSize(100, 100);
+  addDoc(cm, 40, 40);
+  cm.setCursor(39);
+  var wrap = cm.getWrapperElement(), bar = byClassName(wrap, "CodeMirror-scrollbar")[0];
+  is(bar.offsetHeight < wrap.offsetHeight, "vertical scrollbar limited by horizontal one");
+  var cursorBox = byClassName(wrap, "CodeMirror-cursor")[0].getBoundingClientRect();
+  var editorBox = wrap.getBoundingClientRect();
+  is(cursorBox.bottom < editorBox.top + cm.getScrollerElement().clientHeight,
+     "bottom line visible");
+}, {gutter: true});
+
+testCM("moveV stuck", function(cm) {
+  var lines = byClassName(cm.getWrapperElement(), "CodeMirror-lines")[0].firstChild, h0 = lines.offsetHeight;
+  var val = "fooooooooooooooooooooooooo baaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaar\n";
+  cm.setValue(val);
+  for (var w = 50;; w += 5) {
+    cm.setSize(w);
+    if (lines.offsetHeight <= 3 * h0) break;
+  }
+  cm.setCursor({line: 0, ch: val.length - 1});
+  cm.moveV(-1, "line");
+  eqPos(cm.getCursor(), {line: 0, ch: 26});
+}, {lineWrapping: true}, ie_lt8);
+
+testCM("clickTab", function(cm) {
+  var p0 = cm.charCoords({line: 0, ch: 0}), p1 = cm.charCoords({line: 0, ch: 1});
+  eqPos(cm.coordsChar({x: p0.x + 5, y: p0.y + 5}), {line: 0, ch: 0});
+  eqPos(cm.coordsChar({x: p1.x - 5, y: p1.y + 5}), {line: 0, ch: 1});
+}, {value: "\t\n\n", lineWrapping: true, tabSize: 8});
+
+testCM("verticalScroll", function(cm) {
+  cm.setSize(100, 200);
+  cm.setValue("foo\nbar\nbaz\n");
+  var sc = cm.getScrollerElement(), baseWidth = sc.scrollWidth;
+  cm.setLine(0, "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaah");
+  is(sc.scrollWidth > baseWidth, "scrollbar present");
+  cm.setLine(0, "foo");
+  eq(sc.scrollWidth, baseWidth, "scrollbar gone");
+  cm.setLine(0, "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaah");
+  cm.setLine(1, "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbh");
+  is(sc.scrollWidth > baseWidth, "present again");
+  var curWidth = sc.scrollWidth;
+  cm.setLine(0, "foo");
+  is(sc.scrollWidth < curWidth, "scrollbar smaller");
+  is(sc.scrollWidth > baseWidth, "but still present");
+});
+
+testCM("extraKeys", function(cm) {
+  var outcome;
+  function fakeKey(expected, code, props) {
+    if (typeof code == "string") code = code.charCodeAt(0);
+    var e = {type: "keydown", keyCode: code, preventDefault: function(){}, stopPropagation: function(){}};
+    if (props) for (var n in props) e[n] = props[n];
+    outcome = null;
+    cm.triggerOnKeyDown(e);
+    eq(outcome, expected);
+  }
+  CodeMirror.commands.testCommand = function() {outcome = "tc";};
+  CodeMirror.commands.goTestCommand = function() {outcome = "gtc";};
+  cm.setOption("extraKeys", {"Shift-X": function() {outcome = "sx";},
+                             "X": function() {outcome = "x";},
+                             "Ctrl-Alt-U": function() {outcome = "cau";},
+                             "End": "testCommand",
+                             "Home": "goTestCommand",
+                             "Tab": false});
+  fakeKey(null, "U");
+  fakeKey("cau", "U", {ctrlKey: true, altKey: true});
+  fakeKey(null, "U", {shiftKey: true, ctrlKey: true, altKey: true});
+  fakeKey("x", "X");
+  fakeKey("sx", "X", {shiftKey: true});
+  fakeKey("tc", 35);
+  fakeKey(null, 35, {shiftKey: true});
+  fakeKey("gtc", 36);
+  fakeKey("gtc", 36, {shiftKey: true});
+  fakeKey(null, 9);
 });
+
+testCM("wordMovementCommands", function(cm) {
+  cm.execCommand("goWordLeft");
+  eqPos(cm.getCursor(), {line: 0, ch: 0});
+  cm.execCommand("goWordRight"); cm.execCommand("goWordRight");
+  eqPos(cm.getCursor(), {line: 0, ch: 7});
+  cm.execCommand("goWordLeft");
+  eqPos(cm.getCursor(), {line: 0, ch: 5});
+  cm.execCommand("goWordRight"); cm.execCommand("goWordRight");
+  eqPos(cm.getCursor(), {line: 0, ch: 12});
+  cm.execCommand("goWordLeft");
+  eqPos(cm.getCursor(), {line: 0, ch: 9});
+  cm.execCommand("goWordRight"); cm.execCommand("goWordRight"); cm.execCommand("goWordRight");
+  eqPos(cm.getCursor(), {line: 1, ch: 1});
+  cm.execCommand("goWordRight");
+  eqPos(cm.getCursor(), {line: 1, ch: 9});
+  cm.execCommand("goWordRight");
+  eqPos(cm.getCursor(), {line: 1, ch: 13});
+  cm.execCommand("goWordRight"); cm.execCommand("goWordRight");
+  eqPos(cm.getCursor(), {line: 2, ch: 0});
+}, {value: "this is (the) firstline.\na foo12\u00e9\u00f8\u00d7bar\n"});
+
+testCM("charMovementCommands", function(cm) {
+  cm.execCommand("goCharLeft"); cm.execCommand("goColumnLeft");
+  eqPos(cm.getCursor(), {line: 0, ch: 0});
+  cm.execCommand("goCharRight"); cm.execCommand("goCharRight");
+  eqPos(cm.getCursor(), {line: 0, ch: 2});
+  cm.setCursor({line: 1, ch: 0});
+  cm.execCommand("goColumnLeft");
+  eqPos(cm.getCursor(), {line: 1, ch: 0});
+  cm.execCommand("goCharLeft");
+  eqPos(cm.getCursor(), {line: 0, ch: 5});
+  cm.execCommand("goColumnRight");
+  eqPos(cm.getCursor(), {line: 0, ch: 5});
+  cm.execCommand("goCharRight");
+  eqPos(cm.getCursor(), {line: 1, ch: 0});
+  cm.execCommand("goLineEnd");
+  eqPos(cm.getCursor(), {line: 1, ch: 5});
+  cm.execCommand("goLineStartSmart");
+  eqPos(cm.getCursor(), {line: 1, ch: 1});
+  cm.execCommand("goLineStartSmart");
+  eqPos(cm.getCursor(), {line: 1, ch: 0});
+  cm.setCursor({line: 2, ch: 0});
+  cm.execCommand("goCharRight"); cm.execCommand("goColumnRight");
+  eqPos(cm.getCursor(), {line: 2, ch: 0});
+}, {value: "line1\n ine2\n"});
+
+testCM("verticalMovementCommands", function(cm) {
+  cm.execCommand("goLineUp");
+  eqPos(cm.getCursor(), {line: 0, ch: 0});
+  cm.execCommand("goLineDown");
+  eqPos(cm.getCursor(), {line: 1, ch: 0});
+  cm.setCursor({line: 1, ch: 12});
+  cm.execCommand("goLineDown");
+  eqPos(cm.getCursor(), {line: 2, ch: 5});
+  cm.execCommand("goLineDown");
+  eqPos(cm.getCursor(), {line: 3, ch: 0});
+  cm.execCommand("goLineUp");
+  eqPos(cm.getCursor(), {line: 2, ch: 5});
+  cm.execCommand("goLineUp");
+  eqPos(cm.getCursor(), {line: 1, ch: 12});
+  cm.execCommand("goPageDown");
+  eqPos(cm.getCursor(), {line: 5, ch: 0});
+  cm.execCommand("goPageDown"); cm.execCommand("goLineDown");
+  eqPos(cm.getCursor(), {line: 5, ch: 0});
+  cm.execCommand("goPageUp");
+  eqPos(cm.getCursor(), {line: 0, ch: 0});
+}, {value: "line1\nlong long line2\nline3\n\nline5\n"});
+
+testCM("verticalMovementCommandsWrapping", function(cm) {
+  cm.setSize(120);
+  cm.setCursor({line: 0, ch: 5});
+  cm.execCommand("goLineDown");
+  eq(cm.getCursor().line, 0);
+  is(cm.getCursor().ch > 5, "moved beyond wrap");
+  for (var i = 0; ; ++i) {
+    is(i < 20, "no endless loop");
+    cm.execCommand("goLineDown");
+    var cur = cm.getCursor();
+    if (cur.line == 1) eq(cur.ch, 5);
+    if (cur.line == 2) { eq(cur.ch, 1); break; }
+  }
+}, {value: "a very long line that wraps around somehow so that we can test cursor movement\nshortone\nk",
+    lineWrapping: true});

data/public/javascripts/erp_app/shared/dynamic_editable_grid.js

@@ -74,35 +74,41 @@ Ext.define("Compass.ErpApp.Shared.DynamicEditableGrid",{
                 idProperty: ((config.id_property != undefined) ? config.id_property : "id")
             });
             plugins.push(this.editing);
-            tbar = {
-                items:[{
-                    text: 'Add',
-                    iconCls: 'icon-add',
-                    handler: function(button) {
-                        var grid = button.findParentByType('shared_dynamiceditablegrid');
-                        var edit = grid.editing;
-                        grid.store.insert(0, new Model());
-                        edit.startEdit(0,0);
-                    }
-                },
-                '-',
-                {
-                    text: 'Delete',
-                    iconCls: 'icon-delete',
-                    handler: function(button) {
-                        var grid = button.findParentByType('shared_dynamiceditablegrid');
-                        var selection = grid.getView().getSelectionModel().getSelection()[0];
-                        if (selection) {
-                            grid.store.remove(selection);
-                        }
-                    }
-                }]
-            };
-
+            
             config = Ext.apply({
-                plugins:plugins,
-                tbar:tbar
+                plugins:plugins
             }, config);
+
+            if (config.showEditorToolbar){
+                tbar = {
+                    items:[{
+                        text: 'Add',
+                        iconCls: 'icon-add',
+                        handler: function(button) {
+                            var grid = button.findParentByType('shared_dynamiceditablegrid');
+                            var edit = grid.editing;
+                            grid.store.insert(0, new Model());
+                            edit.startEdit(0,0);
+                        }
+                    },
+                    '-',
+                    {
+                        text: 'Delete',
+                        iconCls: 'icon-delete',
+                        handler: function(button) {
+                            var grid = button.findParentByType('shared_dynamiceditablegrid');
+                            var selection = grid.getView().getSelectionModel().getSelection()[0];
+                            if (selection) {
+                                grid.store.remove(selection);
+                            }
+                        }
+                    }]
+                };                
+
+                config = Ext.apply({
+                    tbar:tbar
+                }, config);
+            }
         }
 
         config = Ext.apply({

data/public/javascripts/erp_app/shared/dynamic_editable_grid_loader_panel.js

@@ -31,7 +31,8 @@ Ext.define("Compass.ErpApp.Shared.DynamicEditableGridLoaderPanel",{
                         selType: (config.selType || 'rowmodel'),
                         multiSelect: (config.multiSelect || false),
                         allowDeselect: (config.allowDeselect || false),
-                        timeout: (config.timeout || 30000)
+                        timeout: (config.timeout || 30000),
+                        showEditorToolbar: (config.showEditorToolbar === false ? false : true)
                     });
                     self.down('shared_dynamiceditablegrid').getStore().load();
                 }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: erp_app
 version: !ruby/object:Gem::Version
-  version: 3.0.10
+  version: 3.0.12
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-26 00:00:00.000000000 Z
+date: 2012-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: will_paginate
@@ -1341,6 +1341,7 @@ files:
 - public/javascripts/erp_app/codemirror/lib/util/multiplex.js
 - public/javascripts/erp_app/codemirror/lib/util/overlay.js
 - public/javascripts/erp_app/codemirror/lib/util/pig-hint.js
+- public/javascripts/erp_app/codemirror/lib/util/runmode-standalone.js
 - public/javascripts/erp_app/codemirror/lib/util/runmode.js
 - public/javascripts/erp_app/codemirror/lib/util/search.js
 - public/javascripts/erp_app/codemirror/lib/util/searchcursor.js
@@ -1356,8 +1357,11 @@ files:
 - public/javascripts/erp_app/codemirror/mode/coffeescript/coffeescript.js
 - public/javascripts/erp_app/codemirror/mode/coffeescript/index.html
 - public/javascripts/erp_app/codemirror/mode/coffeescript/LICENSE
+- public/javascripts/erp_app/codemirror/mode/commonlisp/commonlisp.js
+- public/javascripts/erp_app/codemirror/mode/commonlisp/index.html
 - public/javascripts/erp_app/codemirror/mode/css/css.js
 - public/javascripts/erp_app/codemirror/mode/css/index.html
+- public/javascripts/erp_app/codemirror/mode/css/test.js
 - public/javascripts/erp_app/codemirror/mode/diff/diff.js
 - public/javascripts/erp_app/codemirror/mode/diff/index.html
 - public/javascripts/erp_app/codemirror/mode/ecl/ecl.js
@@ -1388,6 +1392,7 @@ files:
 - public/javascripts/erp_app/codemirror/mode/lua/lua.js
 - public/javascripts/erp_app/codemirror/mode/markdown/index.html
 - public/javascripts/erp_app/codemirror/mode/markdown/markdown.js
+- public/javascripts/erp_app/codemirror/mode/markdown/test.js
 - public/javascripts/erp_app/codemirror/mode/mysql/index.html
 - public/javascripts/erp_app/codemirror/mode/mysql/mysql.js
 - public/javascripts/erp_app/codemirror/mode/ntriples/index.html
@@ -1430,6 +1435,9 @@ files:
 - public/javascripts/erp_app/codemirror/mode/scheme/scheme.js
 - public/javascripts/erp_app/codemirror/mode/shell/index.html
 - public/javascripts/erp_app/codemirror/mode/shell/shell.js
+- public/javascripts/erp_app/codemirror/mode/sieve/index.html
+- public/javascripts/erp_app/codemirror/mode/sieve/LICENSE
+- public/javascripts/erp_app/codemirror/mode/sieve/sieve.js
 - public/javascripts/erp_app/codemirror/mode/smalltalk/index.html
 - public/javascripts/erp_app/codemirror/mode/smalltalk/smalltalk.js
 - public/javascripts/erp_app/codemirror/mode/smarty/index.html
@@ -1438,7 +1446,7 @@ files:
 - public/javascripts/erp_app/codemirror/mode/sparql/sparql.js
 - public/javascripts/erp_app/codemirror/mode/stex/index.html
 - public/javascripts/erp_app/codemirror/mode/stex/stex.js
-- public/javascripts/erp_app/codemirror/mode/stex/test.html
+- public/javascripts/erp_app/codemirror/mode/stex/test.js
 - public/javascripts/erp_app/codemirror/mode/tiddlywiki/index.html
 - public/javascripts/erp_app/codemirror/mode/tiddlywiki/tiddlywiki.css
 - public/javascripts/erp_app/codemirror/mode/tiddlywiki/tiddlywiki.js
@@ -1472,8 +1480,12 @@ files:
 - public/javascripts/erp_app/codemirror/README.md
 - public/javascripts/erp_app/codemirror/test/driver.js
 - public/javascripts/erp_app/codemirror/test/index.html
+- public/javascripts/erp_app/codemirror/test/lint/lint.js
+- public/javascripts/erp_app/codemirror/test/lint/parse-js.js
 - public/javascripts/erp_app/codemirror/test/mode_test.css
 - public/javascripts/erp_app/codemirror/test/mode_test.js
+- public/javascripts/erp_app/codemirror/test/phantom_driver.js
+- public/javascripts/erp_app/codemirror/test/run.js
 - public/javascripts/erp_app/codemirror/test/test.js
 - public/javascripts/erp_app/codemirror/theme/ambiance.css
 - public/javascripts/erp_app/codemirror/theme/blackboard.css