Merge branch 'cleaning-code' into v2-dev

Gruntfile.js

@@ -3,7 +3,6 @@ const sass = require('sass');
 const webpackConfig = require('./webpack.config.js');
 
 module.exports = function (grunt) {
-  // configure the tasks
   const config = {
     jasmine: {
       components: {
@@ -53,17 +52,6 @@ module.exports = function (grunt) {
         }
       },
 
-      // Compile ghpages css
-      gh: {
-        options: {
-          outputStyle: 'compressed',
-          sourcemap: false
-        },
-        files: {
-          'docs/css/ghpages-materialize.css': 'sass/ghpages-materialize.scss'
-        }
-      },
-
       // Compile bin css
       bin: {
         options: {
@@ -158,62 +146,6 @@ module.exports = function (grunt) {
           { expand: true, cwd: 'dist/js/', src: ['**/*'], dest: 'materialize-src/js/bin/' },
           { expand: true, cwd: './', src: ['LICENSE', 'README.md'], dest: 'materialize-src/' }
         ]
-      },
-
-      starter_template: {
-        options: {
-          archive: 'templates/starter-template.zip',
-          level: 6
-        },
-        files: [
-          { expand: true, cwd: 'dist/', src: ['**/*'], dest: 'starter-template/' },
-          {
-            expand: true,
-            cwd: 'templates/starter-template/',
-            src: ['index.html', 'LICENSE'],
-            dest: 'starter-template/'
-          },
-          {
-            expand: true,
-            cwd: 'templates/starter-template/css',
-            src: ['style.css'],
-            dest: 'starter-template/css'
-          },
-          {
-            expand: true,
-            cwd: 'templates/starter-template/js',
-            src: ['init.js'],
-            dest: 'starter-template/js'
-          }
-        ]
-      },
-
-      parallax_template: {
-        options: {
-          archive: 'templates/parallax-template.zip',
-          level: 6
-        },
-        files: [
-          { expand: true, cwd: 'dist/', src: ['**/*'], dest: 'parallax-template/' },
-          {
-            expand: true,
-            cwd: 'templates/parallax-template/',
-            src: ['index.html', 'LICENSE', 'background1.jpg', 'background2.jpg', 'background3.jpg'],
-            dest: 'parallax-template/'
-          },
-          {
-            expand: true,
-            cwd: 'templates/parallax-template/css',
-            src: ['style.css'],
-            dest: 'parallax-template/css'
-          },
-          {
-            expand: true,
-            cwd: 'templates/parallax-template/js',
-            src: ['init.js'],
-            dest: 'parallax-template/js'
-          }
-        ]
       }
     },
 
@@ -338,7 +270,7 @@ module.exports = function (grunt) {
 
   // define tasks
   grunt.registerTask('monitor', ['concurrent:monitor']); // DEV
-  grunt.registerTask('sass_compile', ['sass:gh', 'sass:bin', 'postcss:bin']);
+  grunt.registerTask('sass_compile', ['sass:bin', 'postcss:bin']);
   grunt.registerTask('jas_test', ['connect', 'jasmine']);
   grunt.registerTask('test', ['webpack:dev', 'sass_compile', 'jas_test']);
   grunt.registerTask('release', [
@@ -352,8 +284,6 @@ module.exports = function (grunt) {
     'usebanner:release',
     'compress:main',
     'compress:src',
-    'compress:starter_template',
-    'compress:parallax_template',
     'replace:version', // again because of cdn
     'replace:package_json',
     'rename:rename_src',

sass/components/_modal.scss

@@ -1,4 +1,7 @@
 .modal {
+  --modal-footer-height: 56px;
+  --modal-footer-divider-height: 1px;
+
   &:focus {
     outline: none;
   }
@@ -40,7 +43,7 @@
     border-radius: 0 0 2px 2px;
     background-color: $modal-background-color;
     padding: 4px 6px;
-    height: 56px;
+    height: var(--modal-footer-height);
     width: 100%;
     text-align: right;
 
@@ -71,16 +74,16 @@
 
   .modal-content {
     position: absolute;
-    height: calc(100% - 56px);
+    height: calc(100% - var(--modal-footer-height));
     max-height: 100%;
     width: 100%;
     overflow-y: auto;
   }
 
   .modal-footer {
-    border-top: 1px solid $divider-color;
+    border-top: var(--modal-footer-divider-height) solid $divider-color;
     position: absolute;
-    bottom: 0;
+    bottom: var(--modal-footer-divider-height);
   }
 }
 

src/bounding.ts

@@ -1,6 +1,6 @@
 export class Bounding {
-  public left: number; // left offset coordinate
-  public top: number;
-  public width: number;
-  public height: number;
+  left: number; // left offset coordinate
+  top: number;
+  width: number;
+  height: number;
 }

src/edges.ts

@@ -1,6 +1,6 @@
 export class Edges {
-  public top: boolean; // If the top edge was exceeded
-  public right: boolean; // If the right edge was exceeded
-  public bottom: boolean; // If the bottom edge was exceeded
-  public left: boolean; // If the left edge was exceeded
-}
+  top: boolean; // If the top edge was exceeded
+  right: boolean; // If the right edge was exceeded
+  bottom: boolean; // If the bottom edge was exceeded
+  left: boolean; // If the left edge was exceeded
+}

src/utils.ts

@@ -239,7 +239,7 @@ export class Utils {
    * @param wait Wait time.
    * @param options Additional options.
    */
-  public static throttle(func: Function, wait: number, options: Partial<{leading:boolean,trailing:boolean}> = null) {
+  static throttle(func: Function, wait: number, options: Partial<{leading:boolean,trailing:boolean}> = null) {
     let context: object, args: IArguments, result: any;
     let timeout = null;
     let previous = 0;

src/waves.ts

@@ -22,7 +22,7 @@ export class Waves {
 
   // https://phoenix-dx.com/css-techniques-for-material-ripple-effect/
 
-  public static renderWaveEffect(targetElement: HTMLElement, position: Position|null = null, color: RGBColor|null = null): void {
+  static renderWaveEffect(targetElement: HTMLElement, position: Position|null = null, color: RGBColor|null = null): void {
     const isCentered = position === null;
     const duration = 500;
     let animationFrame: number, animationStart: number;