Fixed bootstrap-confirmation issue

Author: bigtimebuddy

bower.json

@@ -1,13 +1,13 @@
 {
 	"name": "SpringRollStudio",
-	"version": "0.2.8",
+	"version": "0.2.9",
 	"private": true,
 	"dependencies": {
 		"jqueryui": "*",
 		"bootstrap": "~3.2.0",
 		"cloudkid-namespace": "*",
 		"requestAnimationFrame": "*",
-		"bootstrap-confirmation": "https://github.com/tavicu/bootstrap-confirmation.git",
+		"bootstrap-confirmation2": "*",
 		"wavesurfer.js": "*",
 		"underscore": "~1.7.0",
 		"node-webkit-app": "*",

deploy/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "SpringRollStudio",
 	"description": "Application for SpringRoll projects",
-	"version": "0.2.8",
+	"version": "0.2.9",
 	"repository": {
 		"type": "git",
 		"url": "https://github.com/SpringRoll/SpringRollStudio"

installer/win32.nsi

@@ -4,7 +4,7 @@
 # These three must be integers
 !define VERSIONMAJOR 0
 !define VERSIONMINOR 2
-!define VERSIONBUILD 8
+!define VERSIONBUILD 9
 # 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"

installer/win64.nsi

@@ -4,7 +4,7 @@
 # These three must be integers
 !define VERSIONMAJOR 0
 !define VERSIONMINOR 2
-!define VERSIONBUILD 8
+!define VERSIONBUILD 9
 # 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"

package.json

@@ -1,7 +1,7 @@
 {
 	"name": "SpringRollStudio",
 	"private": true,
-	"version": "0.2.8",
+	"version": "0.2.9",
 	"dependencies": {
 		"grunt": "^0.4.5",
 		"grunt-appdmg": "^0.3.1",

project.json

@@ -1,6 +1,6 @@
 {
 	"name": "SpringRollStudio",
-	"version": "0.2.8",
+	"version": "0.2.9",
 	"main": [
 		"components/node-webkit-app/src/utils/UpdateChecker.js",
 		"components/node-webkit-app/src/utils/Browser.js",
@@ -20,7 +20,7 @@
 		"components/bootstrap/dist/js/bootstrap.min.js",
 		"components/cloudkid-namespace/dist/namespace.min.js",
 		"components/bootstrap/less/bootstrap.less",
-		"components/bootstrap-confirmation/bootstrap-confirmation.js",
+		"components/bootstrap-confirmation2/bootstrap-confirmation.js",
 		"components/underscore/underscore.js",
 		"components/wavesurfer.js/dist/wavesurfer.min.js",
 		"components/sunlight/build/dist/sunlight-min.js",
@@ -37,7 +37,7 @@
 		"components/bootstrap/dist/js/bootstrap.js",
 		"components/cloudkid-namespace/dist/namespace.js",
 		"components/bootstrap/less/bootstrap.less",
-		"components/bootstrap-confirmation/bootstrap-confirmation.js",
+		"components/bootstrap-confirmation2/bootstrap-confirmation.min.js",
 		"components/underscore/underscore.js",
 		"components/wavesurfer.js/dist/wavesurfer.min.js",
 		"components/sunlight/build/dist/sunlight-min.js",

src/jade/captions.jade

@@ -45,7 +45,7 @@ html
 						button#saveButton.btn.btn-lg.btn-success(type='button')
 							span.glyphicon.glyphicon-ok
 				.sub.col-xs-2.text-right
-					button#deleteButton.btn.btn-lg.btn-danger(type='button', data-toggle='confirmation', data-placement='left', data-popout='true', data-singleton='true', data-title='Remove this caption?', data-container='body')
+					button#deleteButton.btn.btn-lg.btn-danger(type='button', data-toggle='confirmation', data-btn-ok-class="btn-danger", data-btn-cancel-class="btn-default", data-placement='left', data-popout='true', data-singleton='true', data-title='Remove this caption?', data-container='body')
 						span.glyphicon.glyphicon-trash
 		ul#aliasMenu.dropdown-menu(role='menu')
 			li(role='presentation')