Fixed caption errors, flattened UI

Matt Karl · Matt Karl · commit 877bffa86e6d · 2015-03-05T17:51:27.000-05:00
* Fixed captions bug resizing new captions areas
* Added tooltip hover to captions for long aliases
* Fixed captions not being deleted correctly
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
 	"name": "SpringRollStudio",
-	"version": "0.2.1",
+	"version": "0.2.2",
 	"private": true,
 	"dependencies": {
 		"jqueryui": "*",
diff --git a/deploy/index.html b/deploy/index.html
@@ -3,14 +3,14 @@
 	<head>
 		<meta charset="utf-8">
 		<title>SpringRoll Studio</title>
-		<link href="assets/css/libraries.css?v=0.2.1" rel="stylesheet">
-		<link href="assets/css/main.css?v=0.2.1" rel="stylesheet">
-		<script src="assets/js/libraries.js?v=0.2.1"></script>
-		<script src="assets/js/main.js?v=0.2.1"></script>
+		<link href="assets/css/libraries.css?v=0.2.2" rel="stylesheet">
+		<link href="assets/css/main.css?v=0.2.2" rel="stylesheet">
+		<script src="assets/js/libraries.js?v=0.2.2"></script>
+		<script src="assets/js/main.js?v=0.2.2"></script>
 	</head>
 	<body>
 		<header>
-			<img src="assets/images/icon.png?v=0.2.1" class="logo">
+			<img src="assets/images/icon.png?v=0.2.2" class="logo">
 		</header>
 		<nav class="modules btn-group">
 			<a class="btn btn-sm btn-primary" href="new.html" id="new" target="_blank" title="New Project" data-width="550" data-height="670" data-resizable="false">
@@ -37,10 +37,12 @@
 			<a class="btn btn-primary btn-lg requires-project" href="preview.html" id="preview" target="_blank" title="Preview" data-width="800" data-height="550" data-min-height="200" data-min-width="400">
 				<span class="icon glyphicon glyphicon-search"></span> Preview
 			</a>
-			<a class="btn btn-primary btn-lg" href="remote.html" id="remote" target="_blank" title="Remote Trace" data-width="480" data-height="400" data-min-height="275" data-min-width="400">
+		</div>
+		<div class="modules hidden">
+			<a class="btn btn-primary btn-lg hidden" href="remote.html" id="remote" target="_blank" title="Remote Trace" data-width="480" data-height="400" data-min-height="275" data-min-width="400">
 				<span class="icon glyphicon glyphicon-send"></span> Remote Trace
 			</a>
 		</div>
-		<footer class="version">Version <span id="version">0.2.1</span></footer>
+		<footer class="version">Version <span id="version">0.2.2</span></footer>
 	</body>
 </html>
diff --git a/deploy/package.json b/deploy/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "SpringRollStudio",
 	"description": "Application for SpringRoll projects",
-	"version": "0.2.1",
+	"version": "0.2.2",
 	"repository": {
 		"type": "git",
 		"url": "https://github.com/SpringRoll/SpringRollStudio"
@@ -15,7 +15,7 @@
 		"frame": true,
 		"position": "center",
 		"width": 300,
-		"height": 430,
+		"height": 390,
 		"resizable": false
 	},
 	"webkit": {
diff --git a/installer/win32.nsi b/installer/win32.nsi
@@ -4,7 +4,7 @@
 # These three must be integers
 !define VERSIONMAJOR 0
 !define VERSIONMINOR 2
-!define VERSIONBUILD 1
+!define VERSIONBUILD 2
 # These will be displayed by the "Click here for support information" link in "Add/Remove Programs"
 # It is possible to use "mailto:" links in here to open the email client
 !define HELPURL "https://github.com/SpringRoll/SpringRollStudio/issues"
diff --git a/installer/win64.nsi b/installer/win64.nsi
@@ -4,7 +4,7 @@
 # These three must be integers
 !define VERSIONMAJOR 0
 !define VERSIONMINOR 2
-!define VERSIONBUILD 1
+!define VERSIONBUILD 2
 # These will be displayed by the "Click here for support information" link in "Add/Remove Programs"
 # It is possible to use "mailto:" links in here to open the email client
 !define HELPURL "https://github.com/SpringRoll/SpringRollStudio/issues"
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "SpringRollStudio",
 	"private": true,
-	"version": "0.2.1",
+	"version": "0.2.2",
 	"dependencies": {
 		"grunt": "^0.4.5",
 		"grunt-contrib-copy": "^0.7.0",
diff --git a/project.json b/project.json
@@ -1,6 +1,6 @@
 {
 	"name": "SpringRollStudio",
-	"version": "0.2.1",
+	"version": "0.2.2",
 	"main": [
 		"components/node-webkit-app/src/utils/UpdateChecker.js",
 		"components/node-webkit-app/src/utils/Browser.js",
@@ -20,7 +20,6 @@
 		"components/bootstrap/dist/js/bootstrap.min.js",
 		"components/cloudkid-namespace/dist/namespace.min.js",
 		"components/bootstrap/less/bootstrap.less",
-		"components/bootstrap/less/theme.less",
 		"components/bootstrap-confirmation/bootstrap-confirmation.js",
 		"components/underscore/underscore.js",
 		"components/wavesurfer.js/build/wavesurfer.min.js"
@@ -35,7 +34,6 @@
 		"components/bootstrap/dist/js/bootstrap.js",
 		"components/cloudkid-namespace/dist/namespace.js",
 		"components/bootstrap/less/bootstrap.less",
-		"components/bootstrap/less/theme.less",
 		"components/bootstrap-confirmation/bootstrap-confirmation.js",
 		"components/underscore/underscore.js",
 		"components/wavesurfer.js/build/wavesurfer.min.js"
diff --git a/src/springroll/captions/Captions.js b/src/springroll/captions/Captions.js
@@ -356,6 +356,7 @@
 			{
 				// Update the button's data source
 				button.data('src', src);
+				this.list.setStatus(button, this.project.captions[alias] ? 1 : 0);
 
 				// Make sure we clear the current button
 				if (this.list.deselect(alias))
diff --git a/src/springroll/captions/less/timeline.less b/src/springroll/captions/less/timeline.less
@@ -47,7 +47,7 @@
 			overflow: hidden;
 			width:200px;
 			position: absolute;
-			background: linear-gradient(to bottom, #428bca 0, #2d6ca2 100%);
+			background: #428bca;
 			box-shadow:none;
 			color:#fff;
 			height:30px;
diff --git a/src/springroll/captions/ui/List.js b/src/springroll/captions/ui/List.js
@@ -189,7 +189,12 @@
 		// check that file exists!
 		var button = $("<button></button>")
 			.addClass("btn btn-sm")
-			.html(alias)
+			.text(alias)
+			.attr('title', alias)
+			.tooltip({ 
+				container: 'body', 
+				delay: { show: 1000, hide: 100 } 
+			})
 			.attr('data-alias', alias)
 			.data('alias', alias)
 			.data('status', status)
@@ -259,7 +264,11 @@
 
 			if (confirm(message))
 			{
-				this.parent.trigger('selectAudioSrc', [alias, status == -2]);
+				this.parent.trigger('selectAudioSrc', [
+					alias, 
+					status == -2, 
+					button
+				]);
 			}
 			return;
 		}
diff --git a/src/springroll/captions/ui/Timeline.js b/src/springroll/captions/ui/Timeline.js
@@ -91,13 +91,15 @@
 
 		// Add to the list of captions
 		this.captions.append(textarea);
+		
+		this._captions.push(textarea[0]);
+		this._captions.sort(sortCaptions);
 
-		if (!!focus)
+		if (focus)
 		{
 			textarea.trigger('focus');
+			this._onResizeCurrent();
 		}
-		this._captions.push(textarea[0]);
-		this._captions.sort(sortCaptions);
 
 		return textarea;
 	};
@@ -359,7 +361,7 @@
 			for (var i = 0; i < this._captions.length; i++)
 			{
 				var textarea = $(this._captions[i]);
-				var content = textarea.val().trim().replace('/\n|\r/', '');
+				var content = textarea.val().trim().replace(/\n|\r/g, '');
 
 				// Block adding empty captions
 				if (!content) continue;
@@ -414,16 +416,16 @@
 	p.removeCurrent = function()
 	{
 		var currentCaption = this.currentCaption;
-		this.blur();
 		if (currentCaption)
 		{
 			currentCaption.off('keyup focus').remove();
 			var i = this._captions.indexOf(currentCaption[0]);
-			if (i < -1)
+			if (i > -1)
 			{
 				this._captions.splice(i, 1);
 			}
 		}
+		this.blur();
 	};
 
 	// Assign to namespace
diff --git a/src/springroll/less/header.less b/src/springroll/less/header.less
@@ -15,10 +15,7 @@ header {
 		.unselectable();
 	}
 	height:40px;
-	background-image: -webkit-linear-gradient(top,#428bca 0,#2d6ca2 100%);
-	background-image: -o-linear-gradient(top,#428bca 0,#2d6ca2 100%);
-	background-image: linear-gradient(to bottom,#428bca 0,#2d6ca2 100%);
-	background-repeat: repeat-x;
+	background-color: #428bca;
 
 	&.fixed {
 		position:fixed;
diff --git a/src/springroll/tasks/less/main.less b/src/springroll/tasks/less/main.less
@@ -97,9 +97,6 @@ body {
 	background-color: #fff;
 	padding: 5px;
 	border-bottom:1px solid #d3d3d3;
-	background-image: -webkit-linear-gradient(top,#fff 0,#fafafa 100%);
-	background-image: -o-linear-gradient(top,#fff 0,#fafafa 100%);
-	background-image: linear-gradient(to bottom,#fff 0,#fafafa 100%);
 
 	&.running,
 	&.error {
diff --git a/tasks/aliases.js b/tasks/aliases.js
@@ -42,7 +42,7 @@ module.exports = function(grunt)
 	// on the user's platform
 	grunt.registerTask('package', function(platform)
 	{
-		var tasks = ['clean:installers'];
+		var tasks = [];
 
 		// Package a single platform
 		if (platform)
diff --git a/tasks/overrides/clean.js b/tasks/overrides/clean.js
@@ -1,5 +1,4 @@
 module.exports = {
-	installers: ['<%= buildDir %>/<%= project.name %>-Setup-*.*'],
 	defaultTemplate: [
 		'<%= components %>/default/',
 		'<%= distFolder %>/assets/templates/default/'

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "SpringRollStudio",`
`3`		`- "version": "0.2.1",`
	`3`	`+ "version": "0.2.2",`
`4`	`4`	`"private": true,`
`5`	`5`	`"dependencies": {`
`6`	`6`	`"jqueryui": "*",`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "SpringRollStudio",`
`3`	`3`	`"private": true,`
`4`		`- "version": "0.2.1",`
	`4`	`+ "version": "0.2.2",`
`5`	`5`	`"dependencies": {`
`6`	`6`	`"grunt": "^0.4.5",`
`7`	`7`	`"grunt-contrib-copy": "^0.7.0",`
Original file line number	Diff line number	Diff line change
`@@ -356,6 +356,7 @@`
`356`	`356`	`{`
`357`	`357`	`// Update the button's data source`
`358`	`358`	`button.data('src', src);`
	`359`	`+ this.list.setStatus(button, this.project.captions[alias] ? 1 : 0);`
`359`	`360`
`360`	`361`	`// Make sure we clear the current button`
`361`	`362`	`if (this.list.deselect(alias))`