project build improvements, fixes to origin & styles

nikitaeverywhere · nikitaeverywhere · commit a80a74ffae26 · 2015-04-25T15:51:46.000+03:00
diff --git a/gulpfile.js b/gulpfile.js
@@ -4,6 +4,7 @@ var gulp = require("gulp"),
     concat = require("gulp-concat"),
     uglify = require("gulp-uglify"),
     wrap = require("gulp-wrap"),
+    stripComments = require("gulp-strip-comments"),
     addsrc = require('gulp-add-src'),
     minifyCSS = require("gulp-minify-css"),
     htmlReplace = require("gulp-html-replace"),
@@ -14,6 +15,7 @@ var gulp = require("gulp"),
     rename = require("gulp-rename");
 
 var banner = [
+    "",
     "/** <%= pkg.name %>",
     " ** <%= pkg.description %>",
     " ** @author <%= pkg.author %>",
@@ -29,24 +31,40 @@ gulp.task("clean", function () {
         .pipe(clean());
 });
 
-gulp.task("gatherScripts", ["clean"], function () {
-    return gulp.src("web/js/*.js")
-        .pipe(concat("CacheUMLExplorer.js"))
-        .pipe(replace(/\/\*\{\{replace:version}}\*\//, "\"" + pkg["version"] + "\""))
-        .pipe(wrap("CacheUMLExplorer = (function(){<%= contents %> return CacheUMLExplorer;}());"))
+gulp.task("gatherLibs", ["clean"], function () {
+    return gulp.src([
+        "web/jsLib/joint.shapes.uml.js"
+        ])
         .pipe(uglify({
             output: {
                 ascii_only: true,
                 width: 30000,
                 max_line_len: 30000
             }
         }))
-        .pipe(header(banner, { pkg: pkg }))
         .pipe(addsrc.prepend([
             "web/jsLib/joint.min.js",
-            "web/jsLib/joint.shapes.uml.js",
             "web/jsLib/joint.layout.DirectedGraph.min.js"
         ]))
+        .pipe(stripComments({ safe: true }))
+        .pipe(concat("CacheUMLExplorer.js"))
+        .pipe(gulp.dest("build/web/js/"));
+});
+
+gulp.task("gatherScripts", ["clean", "gatherLibs"], function () {
+    return gulp.src("web/js/*.js")
+        .pipe(concat("CacheUMLExplorer.js"))
+        .pipe(replace(/[^\s]+\/\*build.replace:(.*)\*\//g, "$1"))
+        .pipe(wrap("CacheUMLExplorer = (function(){<%= contents %> return CacheUMLExplorer;}());"))
+        .pipe(uglify({
+            output: {
+                ascii_only: true,
+                width: 30000,
+                max_line_len: 30000
+            }
+        }))
+        .pipe(header(banner, { pkg: pkg }))
+        .pipe(addsrc.prepend("build/web/js/CacheUMLExplorer.js"))
         .pipe(concat("CacheUMLExplorer.js"))
         .pipe(gulp.dest("build/web/js/"));
 });
@@ -90,7 +108,7 @@ gulp.task("exportCacheXML", [
             /\{\{replace:js}}/,
             function () { return fs.readFileSync("build/web/js/CacheUMLExplorer.js", "utf-8"); }
         ))
-        .pipe(rename(function (path) { path.basename += "-v" + pkg["version"]; }))
+        .pipe(rename(function (path) { path.basename = "CacheUMLExplorer-v" + pkg["version"]; }))
         .pipe(gulp.dest("build/Cache"));
 });
 
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "CacheUMLExplorer",
-  "version": "0.2",
+  "version": "0.2.0",
   "description": "An UML Class explorer for InterSystems Caché",
   "directories": {
     "test": "test"
@@ -17,6 +17,7 @@
     "gulp-minify-css": "^0.3.11",
     "gulp-rename": "^1.2.0",
     "gulp-replace": "^0.5.0",
+    "gulp-strip-comments": "^1.0.1",
     "gulp-uglify": "^1.0.1",
     "gulp-wrap": "^0.5.0",
     "gulp-zip": "^2.0.2"
diff --git a/web/css/extras.css b/web/css/extras.css
@@ -33,8 +33,8 @@
     width: 30px;
     height: 30px;
     border-radius: 15px;
-    background: white;
-    box-shadow: 0 0 5px white;
+    background: whitesmoke;
+    box-shadow: 0 0 5px whitesmoke;
     z-index: 1;
 }
 
diff --git a/web/index.html b/web/index.html
@@ -2,7 +2,7 @@
 <html>
 <head lang="en">
     <meta charset="UTF-8">
-    <title>Caché UML explorer</title>
+    <title>Cache UML explorer</title>
     <!-- build:css -->
     <link rel="stylesheet" href="css/interface.css"/>
     <link rel="stylesheet" href="css/treeView.css"/>
diff --git a/web/js/Source.js b/web/js/Source.js
@@ -1,6 +1,7 @@
 var Source = function () {
 
-    this.URL = "http://localhost:57773/UMLExplorer";
+    this.URL = window.location.protocol + "//" + window.location.hostname + ":" +
+        57773/*build.replace:window.location.port*/ + "/UMLExplorer";
 
 };
 
diff --git a/web/jsLib/joint.layout.DirectedGraph.min.js b/web/jsLib/joint.layout.DirectedGraph.min.js
diff --git a/web/jsLib/joint.shapes.uml.js b/web/jsLib/joint.shapes.uml.js
@@ -1,4 +1,4 @@
-/*! JointJS v0.9.3 - JavaScript diagramming library  2015-02-03 
+/* JointJS v0.9.3 - JavaScript diagramming library  2015-02-03
 
 
 This Source Code Form is subject to the terms of the Mozilla Public

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-/*! JointJS v0.9.3 - JavaScript diagramming library 2015-02-03`
	`1`	`+/* JointJS v0.9.3 - JavaScript diagramming library 2015-02-03`
`2`	`2`
`3`	`3`
`4`	`4`	`This Source Code Form is subject to the terms of the Mozilla Public`