erp_app 3.0.12 → 3.0.13

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

@@ -20,6 +20,36 @@ MT.testMode(
     'comment', 'foo'
   ]
 );
+// Code blocks using 4 spaces with internal indentation
+MT.testMode(
+  'codeBlocksUsing4SpacesIndentation',
+  '    bar\n        hello\n            world\n    foo\nbar',
+  [
+    null, '    ',
+    'comment', 'bar',
+    null, '        ',
+    'comment', 'hello',
+    null, '            ',
+    'comment', 'world',
+    null, '    ',
+    'comment', 'foo',
+    null, 'bar'
+  ]
+);
+// Code blocks using 4 spaces with internal indentation
+MT.testMode(
+  'codeBlocksUsing4SpacesIndentation',
+  ' foo\n    bar\n        hello\n    world',
+  [
+    null, ' foo',
+    null, '    ',
+    'comment', 'bar',
+    null, '        ',
+    'comment', 'hello',
+    null, '    ',
+    'comment', 'world'
+  ]
+);
 
 // Code blocks using 1 tab (regardless of CodeMirror.indentWithTabs value)
 MT.testMode(
@@ -41,6 +71,17 @@ MT.testMode(
   ]
 );
 
+// Block code using single backtick (shouldn't work)
+MT.testMode(
+  'blockCodeSingleBacktick',
+  '`\nfoo\n`',
+  [
+    'comment', '`',
+    null, 'foo',
+    'comment', '`'
+  ]
+);
+
 // Unclosed backticks
 // Instead of simply marking as CODE, it would be nice to have an 
 // incomplete flag for CODE, that is styled slightly different.
@@ -584,6 +625,24 @@ MT.testMode(
     'comment', 'hello'
   ]
 );
+// Code with internal indentation
+MT.testMode(
+  'listCodeIndentation',
+  '* foo\n\n        bar\n            hello\n                world\n        foo\n    bar',
+  [
+    'string', '* foo',
+    null, '        ',
+    'comment', 'bar',
+    null, '            ',
+    'comment', 'hello',
+    null, '                ',
+    'comment', 'world',
+    null, '        ',
+    'comment', 'foo',
+    null, '    ',
+    'string', 'bar'
+  ]
+);
 // Code followed by text
 MT.testMode(
   'listCodeText',
@@ -660,6 +719,91 @@ MT.testMode(
   ]
 );
 
+// Inline link with Em
+MT.testMode(
+  'linkEm',
+  '[*foo*](http://example.com/) bar',
+  [
+    'link', '[',
+    'link em', '*foo*',
+    'link', ']',
+    'string', '(http://example.com/)',
+    null, ' bar'
+  ]
+);
+
+// Inline link with Strong
+MT.testMode(
+  'linkStrong',
+  '[**foo**](http://example.com/) bar',
+  [
+    'link', '[',
+    'link strong', '**foo**',
+    'link', ']',
+    'string', '(http://example.com/)',
+    null, ' bar'
+  ]
+);
+
+// Inline link with EmStrong
+MT.testMode(
+  'linkEmStrong',
+  '[***foo***](http://example.com/) bar',
+  [
+    'link', '[',
+    'link strong', '**',
+    'link emstrong', '*foo**',
+    'link em', '*',
+    'link', ']',
+    'string', '(http://example.com/)',
+    null, ' bar'
+  ]
+);
+
+// Image with title
+MT.testMode(
+  'imageTitle',
+  '![foo](http://example.com/ "bar") hello',
+  [
+    'tag', '![foo]',
+    'string', '(http://example.com/ "bar")',
+    null, ' hello'
+  ]
+);
+
+// Image without title
+MT.testMode(
+  'imageNoTitle',
+  '![foo](http://example.com/) bar',
+  [
+    'tag', '![foo]',
+    'string', '(http://example.com/)',
+    null, ' bar'
+  ]
+);
+
+// Image with asterisks
+MT.testMode(
+  'imageAsterisks',
+  '![*foo*](http://example.com/) bar',
+  [
+    'tag', '![*foo*]',
+    'string', '(http://example.com/)',
+    null, ' bar'
+  ]
+);
+
+// Not a link. Should be normal text due to square brackets being used
+// regularly in text, especially in quoted material, and no space is allowed
+// between square brackets and parentheses (per Dingus).
+MT.testMode(
+  'notALink',
+  '[foo] (bar)',
+  [
+    null, '[foo] (bar)'
+  ]
+);
+
 // Reference-style links
 MT.testMode(
   'linkReference',
@@ -670,6 +814,44 @@ MT.testMode(
     null, ' hello'
   ]
 );
+// Reference-style links with Em
+MT.testMode(
+  'linkReferenceEm',
+  '[*foo*][bar] hello',
+  [
+    'link', '[',
+    'link em', '*foo*',
+    'link', ']',
+    'string', '[bar]',
+    null, ' hello'
+  ]
+);
+// Reference-style links with Strong
+MT.testMode(
+  'linkReferenceStrong',
+  '[**foo**][bar] hello',
+  [
+    'link', '[',
+    'link strong', '**foo**',
+    'link', ']',
+    'string', '[bar]',
+    null, ' hello'
+  ]
+);
+// Reference-style links with EmStrong
+MT.testMode(
+  'linkReferenceEmStrong',
+  '[***foo***][bar] hello',
+  [
+    'link', '[',
+    'link strong', '**',
+    'link emstrong', '*foo**',
+    'link em', '*',
+    'link', ']',
+    'string', '[bar]',
+    null, ' hello'
+  ]
+);
 
 // Reference-style links with optional space separator (per docuentation)
 // "You can optionally use a space to separate the sets of brackets"
@@ -1081,4 +1263,4 @@ MT.testMode(
   [
     null, '\\\\# foo'
   ]
-);
+);

data/public/javascripts/erp_app/codemirror/package.json

@@ -1,6 +1,6 @@
 {
     "name": "codemirror",
-    "version":"2.34.0",
+    "version":"2.35.0",
     "main": "codemirror.js",
     "description": "In-browser code editing made bearable",
     "licenses": [{"type": "MIT",

data/public/javascripts/erp_app/codemirror/test/index.html

@@ -7,6 +7,7 @@
     <link rel="stylesheet" href="../doc/docs.css">
     <link rel="stylesheet" href="mode_test.css">
     <script src="../lib/codemirror.js"></script>
+    <script src="../lib/util/overlay.js"></script>
     <script src="../mode/javascript/javascript.js"></script>
     <script src="../mode/xml/xml.js"></script>
 
@@ -44,6 +45,8 @@
     <script src="../mode/css/test.js"></script>
     <script src="../mode/markdown/markdown.js"></script>
     <script src="../mode/markdown/test.js"></script>
+    <script src="../mode/gfm/gfm.js"></script>
+    <script src="../mode/gfm/test.js"></script>
     <script src="../mode/stex/stex.js"></script>
     <script src="../mode/stex/test.js"></script>
     <script>

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

@@ -287,16 +287,21 @@ testCM("markTextMultiLine", function(cm) {
 });
 
 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});
+  var marker1, marker2, bookmark;
+  cm.compoundChange(function(){
+    marker1 = cm.markText({line: 0, ch: 1}, {line: 0, ch: 3}, "CodeMirror-matchingbracket");
+    marker2 = cm.markText({line: 0, ch: 0}, {line: 2, ch: 1}, "CodeMirror-matchingbracket");
+    bookmark = cm.setBookmark({line: 1, ch: 5});
+  });
+  cm.compoundChange(function(){
+    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();
+  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});

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: erp_app
 version: !ruby/object:Gem::Version
-  version: 3.0.12
+  version: 3.0.13
   prerelease: 
 platform: ruby
 authors:
@@ -9,27 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-12 00:00:00.000000000 Z
+date: 2012-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: will_paginate
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70249237502620 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - =
       - !ruby/object:Gem::Version
         version: 3.0.2
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 3.0.2
+  version_requirements: *70249237502620
 - !ruby/object:Gem::Dependency
   name: uglifier
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70249237502100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -37,15 +32,10 @@ dependencies:
         version: 1.0.3
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.0.3
+  version_requirements: *70249237502100
 - !ruby/object:Gem::Dependency
   name: erp_tech_svcs
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70249237501640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -53,15 +43,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.0'
+  version_requirements: *70249237501640
 - !ruby/object:Gem::Dependency
   name: erp_dev_svcs
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70249237501180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -69,12 +54,7 @@ dependencies:
         version: '3.0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.0'
+  version_requirements: *70249237501180
 description: Provides an application infrastructure based on the Sencha/extjs UI framework,
   as well as several utilities and example applications. It houses the core application
   container framework and component model infrastructure that play a key role in the
@@ -1324,6 +1304,7 @@ files:
 - public/javascripts/erp_app/codemirror/doc/internals.html
 - public/javascripts/erp_app/codemirror/doc/manual.html
 - public/javascripts/erp_app/codemirror/doc/oldrelease.html
+- public/javascripts/erp_app/codemirror/doc/realworld.html
 - public/javascripts/erp_app/codemirror/doc/reporting.html
 - public/javascripts/erp_app/codemirror/doc/upgrade_v2.2.html
 - public/javascripts/erp_app/codemirror/keymap/emacs.js
@@ -1370,6 +1351,7 @@ files:
 - public/javascripts/erp_app/codemirror/mode/erlang/index.html
 - public/javascripts/erp_app/codemirror/mode/gfm/gfm.js
 - public/javascripts/erp_app/codemirror/mode/gfm/index.html
+- public/javascripts/erp_app/codemirror/mode/gfm/test.js
 - public/javascripts/erp_app/codemirror/mode/go/go.js
 - public/javascripts/erp_app/codemirror/mode/go/index.html
 - public/javascripts/erp_app/codemirror/mode/groovy/groovy.js
@@ -1384,6 +1366,7 @@ files:
 - public/javascripts/erp_app/codemirror/mode/htmlmixed/index.html
 - public/javascripts/erp_app/codemirror/mode/javascript/index.html
 - public/javascripts/erp_app/codemirror/mode/javascript/javascript.js
+- public/javascripts/erp_app/codemirror/mode/javascript/typescript.html
 - public/javascripts/erp_app/codemirror/mode/jinja2/index.html
 - public/javascripts/erp_app/codemirror/mode/jinja2/jinja2.js
 - public/javascripts/erp_app/codemirror/mode/less/index.html
@@ -3715,7 +3698,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Provides an application infrastructure based on the Sencha/extjs UI framework,