Switched to Uglify2

css/default.css

@@ -18,6 +18,11 @@ body {
     tab-size: 4;
 }
 
+#wmd-preview {
+	padding: 19px;
+    margin-bottom: 50px;
+}
+
 .working {
     cursor: progress;
 }

css/main-min.css

@@ -5369,6 +5369,10 @@ body {
     background-color: #f5f5f5;
     tab-size: 4;
 }
+#wmd-preview {
+	padding: 19px;
+    margin-bottom: 30px;
+}
 .working {
     cursor: progress;
 }

img/stackedit-half.svg

@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="32"
+   height="32"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="stackedit-half.svg"
+   inkscape:export-filename="C:\Documents and Settings\g550003\Mes documents\Mes images\stackedit-96.png"
+   inkscape:export-xdpi="270"
+   inkscape:export-ydpi="270">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="13.984375"
+     inkscape:cx="38.091753"
+     inkscape:cy="18.637995"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="1920"
+     inkscape:window-height="1143"
+     inkscape:window-x="-4"
+     inkscape:window-y="-4"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3000"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1020.3622)">
+    <path
+       style="fill:none;stroke:#626265;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="M 2,0 2,12 30,12 30,0"
+       id="path3001"
+       inkscape:connector-curvature="0"
+       transform="translate(0,1036.3622)"
+       sodipodi:nodetypes="cccc" />
+    <path
+       style="fill:none;stroke:#6c6c70;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="m 6,23 18,0"
+       id="path3789"
+       inkscape:connector-curvature="0"
+       transform="translate(0,1020.3622)"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;stroke:#95785b;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="m 6,19 16,0"
+       id="path3791"
+       inkscape:connector-curvature="0"
+       transform="translate(0,1020.3622)"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;stroke:#bc8e48;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="m 6,15 8,0"
+       id="path3793"
+       inkscape:connector-curvature="0"
+       transform="translate(0,1020.3622)"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;stroke:#d38b28;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="m 6,11 20,0"
+       id="path3795"
+       inkscape:connector-curvature="0"
+       transform="translate(0,1020.3622)"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;stroke:#fd8a07;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="M 6,7 20,7"
+       id="path3797"
+       inkscape:connector-curvature="0"
+       transform="translate(0,1020.3622)"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;stroke:#fe7a15;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
+       d="M 6,3 26,3"
+       inkscape:connector-curvature="0"
+       id="path3799"
+       transform="translate(0,1020.3622)" />
+    <path
+       style="fill:#ffffff;fill-opacity:0.09803922;stroke:none"
+       d="M 6 2 L 6 4 L 13.3125 4 L 12.84375 2 L 6 2 z M 6 6 L 6 8 L 14.28125 8 L 13.8125 6 L 6 6 z M 6 10 L 6 12 L 15.25 12 L 14.75 10 L 6 10 z M 6 14 L 6 16 L 14 16 L 14 14 L 6 14 z M 0 16 L 0 28 L 0 30 L 2 30 L 19.53125 30 L 18.5625 26 L 4 26 L 4 16 L 0 16 z M 6 18 L 6 20 L 17.125 20 L 16.65625 18 L 6 18 z M 6 22 L 6 24 L 18.09375 24 L 17.625 22 L 6 22 z "
+       transform="translate(0,1020.3622)"
+       id="path2990" />
+  </g>
+</svg>

index.html

@@ -647,11 +647,11 @@
 				<div class="tab-pane" id="tabpane-settings-utils">
 					<div class="tab-pane-button-container">
 						<a href="#" class="btn btn-block btn-primary action-welcome-file"
-							data-dismiss="modal">Welcome document</a> <a href="#"
+							data-dismiss="modal"><i class="icon-info-sign icon-white"></i> Welcome document</a> <a href="#"
 							class="btn btn-block btn-primary action-default-settings"
-							data-dismiss="modal">Load default settings</a> <a href="#"
+							data-dismiss="modal"><i class="icon-wrench icon-white"></i> Load default settings</a> <a href="#"
 							class="btn btn-block btn-primary" data-dismiss="modal"
-							data-toggle="modal" data-target="#modal-app-reset">Reset
+							data-toggle="modal" data-target="#modal-app-reset"><i class="icon-fire icon-white"></i> Reset
 							application</a>
 					</div>
 				</div>

js/config.js

@@ -34,7 +34,7 @@ function runDelayedFunction() {
 }
 
 // Site dependent
-var BASE_URL = "http://localhost/";
+var BASE_URL = "http://localhost/stackedit/";
 var GOOGLE_CLIENT_ID = '241271498917-lev37kef013q85avc91am1gccg5g8lrb.apps.googleusercontent.com';
 var GITHUB_CLIENT_ID = 'e47fef6055344579799d';
 var GATEKEEPER_URL = "http://stackedit-gatekeeper-localhost.herokuapp.com/";

js/core.js

@@ -174,7 +174,7 @@ define([
         extensionMgr.onLayoutConfigure(layoutGlobalConfig);
         if(settings.layoutOrientation == "horizontal") {
             $(".ui-layout-south").remove();
-            $(".preview-container").html('<div id="wmd-preview" class="well"></div>');
+            $(".preview-container").html('<div id="wmd-preview"></div>');
             layout = $('body').layout($.extend(layoutGlobalConfig, {
                 east__resizable: true,
                 east__size: .5,
@@ -183,7 +183,7 @@ define([
         }
         else if(settings.layoutOrientation == "vertical") {
             $(".ui-layout-east").remove();
-            $(".preview-container").html('<div id="wmd-preview" class="well"></div>');
+            $(".preview-container").html('<div id="wmd-preview"></div>');
             layout = $('body').layout($.extend(layoutGlobalConfig, {
                 south__resizable: true,
                 south__size: .5,

js/extensions/buttonSync.js

@@ -20,7 +20,7 @@ define([
     };
 
     buttonSync.onSaveSettings = function(newConfig, event) {
-        newConfig.syncPeriod = utils.getInputIntValue("#input-sync-period", undefined, 0);
+        newConfig.syncPeriod = utils.getInputIntValue("#input-sync-period", event, 0);
     };
 
     var button = undefined;

js/extensions/googleAnalytics.js

@@ -31,7 +31,6 @@ define([
         }
     };
 
-    var currentAction = "Unknown";
     googleAnalytics.onReady = function() {
 
         // First configure GA
@@ -96,9 +95,9 @@ define([
         window.onerror = function(message, url, line) {
             _gaq.push([
                 "_trackEvent",
-                currentAction,
+                "Error",
-                'JS error',
+                url,
-                message + "(" + url + ": " + line + ")"
+                message + " (" + line + ")"
             ]);
         };
 
@@ -112,21 +111,14 @@ define([
     var startTime = 0;
     googleAnalytics.onSyncRunning = function(isRunning) {
         if(isRunning === true) {
-            currentAction = "Sync";
             startTime = new Date().getTime();
         }
     };
     googleAnalytics.onPublishRunning = function(isRunning) {
         if(isRunning === true) {
-            currentAction = "Publish";
             startTime = new Date().getTime();
         }
     };
-    googleAnalytics.onAsyncRunning = function(isRunning) {
-        if(isRunning === false) {
-            currentAction = "Unknown";
-        }
-    };
 
     // Log sync time
     googleAnalytics.onSyncSuccess = function() {
@@ -194,19 +186,5 @@ define([
         ]);
     };
 
-    // Log error messages
-    googleAnalytics.onError = function(error) {
-        if(_.isString(error) || !error.message) {
-            return;
-        }
-        _gaq.push([
-            '_trackEvent',
-            currentAction,
-            'Error',
-            error.message
-        ]);
-    };
-
     return googleAnalytics;
-
 });

js/html/buttonSyncSettingsBloc.html

@@ -1,10 +1,11 @@
 <p>Adds a "Synchronize documents" button in the navigation bar.</p>
 <div class="form-horizontal">
 	<div class="control-group">
-		<label class="control-label" for="input-sync-period">Sync period (optional)</label>
+		<label class="control-label" for="input-sync-period">Sync
+			period (0: manual)</label>
 		<div class="controls">
-			<input type="text" id="input-sync-period"
+			<input type="text" id="input-sync-period" class="input-mini"
-				class="input-mini"> <span class="help-inline">ms</span>
+				placeholder="180000"> <span class="help-inline">ms</span>
 		</div>
 	</div>
 </div>

js/html/dialogAbout.html

@@ -3,7 +3,7 @@
 	<dt>About:</dt>
 	<dd>
 		<a target="_blank" href="https://github.com/benweet/stackedit/">GitHub
-			page</a> / <a target="_blank"
+			project</a> / <a target="_blank"
 			href="https://github.com/benweet/stackedit/issues">issue tracker</a>
 	</dd>
 	<dd>
@@ -31,24 +31,23 @@
 		<a target="_blank" href="http://www.benoitschweblin.com">Benoit
 			Schweblin</a><br />
 	</dd>
-	<dd>Pete Eigel (contributor)
+	<dd>Pete Eigel (contributor)</dd>
-	</dd>
 </dl>
 <dl>
 	<dt>Credit:</dt>
 	<% _.each(libraries, function(url, name) { %>
-    <dd>
+	<dd>
-        <a target="_blank" href="<%= url %>"><%= name %></a>
+		<a target="_blank" href="<%= url %>"><%= name %></a>
-    </dd>
+	</dd>
 	<% }); %>
 </dl>
 <dl>
 	<dt>Related projects:</dt>
-    <% _.each(projects, function(url, name) { %>
+	<% _.each(projects, function(url, name) { %>
-    <dd>
+	<dd>
-        <a target="_blank" href="<%= url %>"><%= name %></a>
+		<a target="_blank" href="<%= url %>"><%= name %></a>
-    </dd>
+	</dd>
-    <% }); %>
+	<% }); %>
 </dl>
 <p>Copyright 2013 <a target="_blank"
 	href="http://www.benoitschweblin.com">Benoit Schweblin</a><br />

themes/blue-gray/blue-gray.css

@@ -1,6 +1,6 @@
 body,
 .btn,
-.well,
+#wmd-preview,
 .modal-footer,
 pre,
 input[disabled],

themes/night/night.css

@@ -1,6 +1,6 @@
 body,
 .btn,
-.well,
+#wmd-preview,
 .modal-footer,
 input[disabled],
 select[disabled],
@@ -42,6 +42,10 @@ a:focus {
 	text-decoration: underline;
 }
 
+#file-title {
+	color: #bbb;
+}
+
 #file-title:hover {
     color: #fff;
 }
@@ -50,11 +54,11 @@ blockquote {
     border-color: #333;
 }
 
-.well {
+#wmd-preview {
 	color: #ccc;
 }
 
-.well blockquote {
+#wmd-preview blockquote {
     border-color: #444;
 }
 

tools/optimize-js.json

@@ -4,4 +4,11 @@
     name: "main",
     out: "../js/main-min.js",
     mainConfigFile: '../js/main.js',
+    optimize: "uglify2",
+    uglify2: {
+        output: {
+            beautify: true,
+            indent_level: 1,
+        },
+    },
 })

viewer.html

@@ -75,7 +75,7 @@
 	</div>
 	<div id="wmd-button-bar" class="hide"></div>
 	<textarea id="wmd-input" class="hide"></textarea>
-	<div id="wmd-preview" class="well"></div>
+	<div id="wmd-preview"></div>
 
     <div id="modal-non-unique" class="modal hide">
         <div class="modal-header">