Automated merge with http://hg.netbeans.org/web-main ecma7
authorPetr Pisl <ppisl@netbeans.org>
Wed, 13 Jul 2016 16:07:56 +0200
branchecma7
changeset 3101398dcbd67d5599
parent 310137 42dda6b1bf4f
parent 310138 0165eff03456
child 310140 0f16e4ffb9b6
Automated merge with http://hg.netbeans.org/web-main
     1.1 --- a/javascript2.editor/src/org/netbeans/modules/javascript2/editor/embedding/JsEmbeddingProvider.java	Wed Jul 13 15:55:17 2016 +0200
     1.2 +++ b/javascript2.editor/src/org/netbeans/modules/javascript2/editor/embedding/JsEmbeddingProvider.java	Wed Jul 13 16:07:56 2016 +0200
     1.3 @@ -172,7 +172,7 @@
     1.4          translators.put(TPL_MIME_TYPE, new TplTranslator());
     1.5          translators.put(TWIG_MIME_TYPE, new TwigTranslator());
     1.6          translators.put(LATTE_MIME_TYPE, new LatteTranslator());
     1.7 -        translators.put(JSX, new ReactJsTranslator());
     1.8 +        translators.put(JSX, new JsxJsTranslator());
     1.9      }
    1.10      // If you change this, update the testcase reference
    1.11      private static final String GENERATED_IDENTIFIER = "__UNKNOWN__"; // NOI18N
    1.12 @@ -634,7 +634,7 @@
    1.13          }
    1.14      } // End of RhtmlTranslator class
    1.15  
    1.16 -    private static class ReactJsTranslator implements Translator {
    1.17 +    private static class JsxJsTranslator implements Translator {
    1.18  
    1.19          private static final int MAX_EMBEDDING_LENGTH = 5000000; //cca 5M
    1.20          public static final String GENERATED_CODE = "@@@"; //NOI18N