Merge remote-tracking branch 'origin/MAGETWO-38002' into PR

Author: Natalia Momotenko

Gruntfile.js

@@ -68,12 +68,17 @@ module.exports = function (grunt) {
             'less:luma',
             'less:backend'
         ],
+
         /**
          * Documentation
          */
         documentation: [
+            'replace:documentation',
             'less:documentation',
             'styledocco:documentation',
+            'usebanner:documentationCss',
+            'usebanner:documentationLess',
+            'usebanner:documentationHtml',
             'clean:var',
             'clean:pub'
         ],
@@ -82,12 +87,6 @@ module.exports = function (grunt) {
             'mage-minify:legacy'
         ],
 
-        'documentation-banners': [
-            'usebanner:documentationCss',
-            'usebanner:documentationLess',
-            'usebanner:documentationHtml'
-        ],
-
         spec: function (theme) {
             var runner = require('./dev/tests/js/jasmine/spec_runner');
 

dev/tools/grunt/configs/replace.js

@@ -0,0 +1,55 @@
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+'use strict';
+
+var nlWin = '\r\n',
+    nlUnix = '\n';
+
+function findCopyright(lang, nlSys) {
+    var copyrightText = {
+        firstLine: 'Copyright © 2015 Magento. All rights reserved.',
+        secondLine: 'See COPYING.txt for license details.'
+    };
+    switch (lang) {
+        case 'less':
+            return new RegExp(
+                '// /\\*\\*' + nlSys + '//  \\* ' +
+                copyrightText.firstLine +
+                '' + nlSys + '//  \\* ' +
+                copyrightText.secondLine +
+                '' + nlSys + '//  \\*/' + nlSys + nlSys
+            );
+            break;
+        default:
+            return;
+    }
+}
+
+module.exports = {
+    documentation: {
+        options: {
+            patterns: [
+                {
+                    match: findCopyright('less', nlWin),
+                    replacement: ''
+                },
+                {
+                    match: findCopyright('less', nlUnix),
+                    replacement: ''
+                }
+            ]
+        },
+        files: [{
+            expand: true,
+            flatten: true,
+            src: [
+                '<%= path.doc %>/source/**/*.less'
+            ],
+            dest: '<%= path.doc %>/source/'
+        }]
+    }
+
+};

dev/tools/grunt/configs/usebanner.js

@@ -5,22 +5,26 @@
 
 'use strict';
 
-var banner = {
-    firstLine: 'Copyright © 2015 Magento. All rights reserved.',
-    secondLine: 'See COPYING.txt for license details.',
-
-    css: function () {
-        return '/**\n * ' + this.firstLine + '\n * ' + this.secondLine + '\n */\n';
-    },
-
-    less: function () {
-        return '// /**\n//  * ' + this.firstLine + '\n//  * ' + this.secondLine + '\n//  */\n';
-    },
-
-    html: function () {
-        return '<!--\n/**\n * ' + this.firstLine + '\n * ' + this.secondLine + '\n */\n-->\n';
+function printCopyright(lang) {
+    var copyrightText = {
+            firstLine: 'Copyright © 2015 Magento. All rights reserved.',
+            secondLine: 'See COPYING.txt for license details.'
+        },
+        nlWin = '\r\n';
+    switch (lang) {
+        case 'css':
+            return '/**' + nlWin + ' * ' + copyrightText.firstLine + nlWin + ' * ' + copyrightText.secondLine + nlWin + ' */' + nlWin;
+            break;
+        case 'less':
+            return '// /**' + nlWin + '//  * ' + copyrightText.firstLine + nlWin + '//  * ' + copyrightText.secondLine + nlWin + '//  */' + nlWin;
+            break;
+        case 'html':
+            return '<!--' + nlWin + '/**' + nlWin + ' * ' + copyrightText.firstLine + nlWin + ' * ' + copyrightText.secondLine + nlWin + ' */' + nlWin + '-->' + nlWin;
+            break;
+        default:
+            return;
     }
-};
+}
 
 module.exports = {
     options: {
@@ -29,31 +33,31 @@ module.exports = {
     },
     setup: {
         options: {
-            banner: banner.css()
+            banner: printCopyright('css')
         },
         files: {
             src: '<%= path.css.setup %>/*.css'
         }
     },
     documentationCss: {
         options: {
-            banner: banner.css()
+            banner: printCopyright('css')
         },
         files: {
             src: '<%= path.doc %>/**/*.css'
         }
     },
     documentationLess: {
         options: {
-            banner: banner.less()
+            banner: printCopyright('less')
         },
         files: {
             src: '<%= path.doc %>/**/*.less'
         }
     },
     documentationHtml: {
         options: {
-            banner: banner.html()
+            banner: printCopyright('html')
         },
         files: {
             src: '<%= path.doc %>/**/*.html'

package.json

@@ -20,6 +20,7 @@
     "grunt-contrib-less": "^0.12.0",
     "grunt-contrib-watch": "^0.6.1",
     "grunt-exec": "^0.4.6",
+    "grunt-replace": "^0.9.2",
     "grunt-styledocco": "^0.1.4",
     "grunt-template-jasmine-requirejs": "^0.2.3",
     "grunt-text-replace": "^0.4.0",