Forráskód Böngészése

Configured uglifyjs

Andrea Condoluci 9 éve
szülő
commit
fcd2632b54
2 módosított fájl, 26 hozzáadás és 16 törlés
  1. 15 12
      Gruntfile.js
  2. 11 4
      src/MusicalScore/Calculation/MeasureSizeCalculator.ts

+ 15 - 12
Gruntfile.js

@@ -54,18 +54,20 @@ module.exports = function (grunt) {
             }
         },
         // Uglify
-        /*uglify: {
-          options: {
-            compress: {
-              drop_console: true
-            }
-          },
-          my_target: {
-            files: {
-              'build/osmd.js': ['src/input.js']
+        uglify: {
+            options: {
+                compress: {
+                    drop_console: true
+                },
+                banner: banner,
+                mangleProperties: true
+            },
+            my_target: {
+                files: {
+                    'build/osmd.min.js': ['build/osmd.js']
+                }
             }
-          }
-        },*/
+        },
         // Karma setup
         karma: {
             // For continuous integration
@@ -143,10 +145,11 @@ module.exports = function (grunt) {
     grunt.loadNpmTasks('grunt-contrib-clean');
     grunt.loadNpmTasks('grunt-contrib-watch');
     grunt.loadNpmTasks('grunt-contrib-jshint');
+    grunt.loadNpmTasks('grunt-contrib-uglify');
 
     // Register tasks
     grunt.registerTask('all',     ['typings', 'default']);
-    grunt.registerTask('default', ['lint', 'browserify', 'karma:ci']);
+    grunt.registerTask('default', ['lint', 'browserify', 'karma:ci', 'uglify']);
     grunt.registerTask('test',    ['lint', 'browserify:debug', 'karma:ci']);
     grunt.registerTask('fasttest', ['browserify:debug', 'karma:ci']);
     grunt.registerTask('rebuild', ['clean', 'default']);

+ 11 - 4
src/MusicalScore/Calculation/MeasureSizeCalculator.ts

@@ -106,8 +106,7 @@ export class MeasureSizeCalculator {
     }
 
     for (let i: number = 0, len: number = outline.length; i < len; i += 3) {
-      //console.log(i, outline[i]);
-      switch (<string> outline[i]) {
+      switch (outline[i] as string) {
         case "m": update(i); break;
         case "l": update(i); break;
         case "q": i += 2; update(i); break;
@@ -124,6 +123,16 @@ export class MeasureSizeCalculator {
     );
   }
 
+
+  public static getKeySignatureBoundingBox(sig: any): Vex.Flow.BoundingBox {
+    let width: number = sig.getWidth();
+    return new Vex.Flow.BoundingBox(
+        0, 0,
+        width, 0
+    );
+  }
+
+
   public getWidth(): number {
     // begin_modifiers + voices + end_modifiers
     return this.offsetLeft + this.voicesWidth + this.offsetRight;
@@ -174,8 +183,6 @@ export class MeasureSizeCalculator {
     // TODO voicesBoundingBox.getW() should be similar to this.voicesWidth?
     //console.log("this.width", this.voicesWidth);
     //console.log("voicesBB", voicesBoundingBox.getW());
-
-
     //this.height = voicesBoundingBox.getH(); FIXME
 
     // Consider clefs