Whitespace tidy-up

For the JS/CSS, I hit CTRL+K,D to give the default formatting. @mattbrailsford - If you don't like the CSS style, we can either revert or update VS rules.
umco · Mar 18, 2017 · 0a03ce0 · 0a03ce0
1 parent b03fec7
commit 0a03ce0
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 80 deletions.
diff --git a/build/install.ps1 b/build/install.ps1
@@ -12,7 +12,7 @@ if (!$contentFolder)
 	$projectPath = Join-Path $projDirectory -ChildPath "App_Plugins"
 	$projectPathExists = Test-Path $projectPath
 
-	if ($projectPathExists) {	
+	if ($projectPathExists) {
 		Write-Host "Updating Stacked Content App_Plugin files using PS as they have been excluded from the project"
 		Copy-Item $newPackageFiles $projectPath -Recurse -Force
 	}

diff --git a/src/Our.Umbraco.StackedContent/Converters/StackedContentValueConverter.cs b/src/Our.Umbraco.StackedContent/Converters/StackedContentValueConverter.cs
@@ -29,9 +29,7 @@ public override object ConvertDataToSource(PublishedPropertyType propertyType, o
                     var rawValue = JsonConvert.DeserializeObject<JArray>(source.ToString());
 
                     return ConvertInnerContentDataToSource(rawValue, null, 1, preview);
-
                 }
-
             }
             catch (Exception e)
             {

diff --git a/src/Our.Umbraco.StackedContent/Web/UI/App_Plugins/StackedContent/css/stackedcontent.css b/src/Our.Umbraco.StackedContent/Web/UI/App_Plugins/StackedContent/css/stackedcontent.css
@@ -1,46 +1,39 @@
-.stacked-content
-{
+.stacked-content {
     position: relative;
 }
 
 .stacked-content .umb-load-indicator {
     margin-top: 10px;
 }
 
-.stack__wrapper
-{
+.stack__wrapper {
     margin-right: 12px;
 }
 
-.stack__item
-{
+.stack__item {
     position: relative;
     display: block;
     margin: 0;
     z-index: 10;
 }
 
-.stack__preview-wrapper
-{
+.stack__preview-wrapper {
     position: relative;
     border: 1px solid #f8f8f8;
 }
 
 .stacked-content .placeholder,
-.stack__preview
-{
+.stack__preview {
     display: block;
     text-decoration: none !important;
     cursor: pointer;
 }
 
 .stacked-content .placeholder,
-.stack__preview--default
-{
+.stack__preview--default {
     background-color: #f8f8f8;
     padding: 20px;
     text-align: center;
-
     transition: background-color .25s ease-in-out;
     -moz-transition: background-color .25s ease-in-out;
     -webkit-transition: background-color .25s ease-in-out;
@@ -49,75 +42,63 @@
 .stacked-content .placeholder:hover,
 .stacked-content .placeholder:active,
 .stack__preview--default:hover,
-.stack__preview--default:active
-{
+.stack__preview--default:active {
     background-color: #f5f5f5;
 }
 
 .stacked-content .placeholder .icon,
-.stack__preview--default .icon
-{
+.stack__preview--default .icon {
     font-size: 60px;
     line-height: 60px;
     color: rgba(0,0,0, 0.1);
 }
 
 .stacked-content .placeholder h3,
-.stack__preview--default h3
-{
+.stack__preview--default h3 {
     color: #343434;
     font-size: 14px;
     font-weight: bold;
     line-height: 20px;
     margin: 0;
 }
 
-.stacked-content .placeholder
-{
+.stacked-content .placeholder {
     border: 2px dashed #d9d9d9;
     background-color: #fff;
 }
 
 .stacked-content .placeholder,
-.stacked-content .placeholder *
-{
+.stacked-content .placeholder * {
     transition: .25s ease-in-out;
     -moz-transition: .25s ease-in-out;
     -webkit-transition: .25s ease-in-out;
 }
 
-.stacked-content .placeholder:hover 
-{
+.stacked-content .placeholder:hover {
     border-color: #2e8aea;
     background-color: #fff;
 }
 
-.stacked-content .placeholder:hover * 
-{
+.stacked-content .placeholder:hover * {
     color: #2e8aea;
 }
 
-.stack__buttons
-{
+.stack__buttons {
     position: absolute;
     right: -12px;
     top: 10px;
-
     background-color: #2e8aea;
     color: white;
     opacity: 0;
-
     transition: opacity .25s ease-in-out;
     -moz-transition: opacity .25s ease-in-out;
     -webkit-transition: opacity .25s ease-in-out;
-
     -webkit-box-shadow: 0px 0px 10px 0px rgba(0,0,0,0.25);
     -moz-box-shadow: 0px 0px 10px 0px rgba(0,0,0,0.25);
     box-shadow: 0px 0px 10px 0px rgba(0,0,0,0.25);
 }
 
-.stack__buttons:after
-{
+.stack__buttons:after {
     position: absolute;
     bottom: -12px;
     right: 0;
@@ -129,32 +110,27 @@
     border-color: #1960ab transparent transparent transparent;
 }
 
-.stack__buttons .umb_confirm-action__overlay 
-{
+.stack__buttons .umb_confirm-action__overlay {
     position: relative;
     display: inline-block;
     left: 0;
     z-index: 5;
 }
 
-.stack__buttons .umb_confirm-action__overlay-action 
-{
+.stack__buttons .umb_confirm-action__overlay-action {
     margin: 0 !important;
     background-color: #2e8aea;
-
     -webkit-border-radius: 0;
     -moz-border-radius: 0;
     border-radius: 0;
-
     -webkit-box-shadow: none;
     -moz-box-shadow: none;
     box-shadow: none;
     z-index: 5;
 }
 
 .stack__preview:hover + .stack__buttons,
-.stack__buttons:hover
-{
+.stack__buttons:hover {
     opacity: 1;
 }
 
@@ -165,8 +141,7 @@
 
 .stack__button,
 .stack__add-button,
-.stack__buttons .umb_confirm-action__overlay-action
-{
+.stack__buttons .umb_confirm-action__overlay-action {
     display: inline-block;
     background-color: #2e8aea;
     color: white !important;
@@ -182,8 +157,7 @@
 .stack__button:hover,
 .stack__add-button:hover,
 .stack__buttons .umb_confirm-action__overlay-action.-cancel:hover,
-.stack__buttons .umb_confirm-action__overlay-action.-confirm:hover
-{
+.stack__buttons .umb_confirm-action__overlay-action.-confirm:hover {
     color: white !important;
     text-decoration: none !important;
 }
@@ -196,103 +170,85 @@
     background-color: #e74c3c;
 }
 
-.stack__add-button
-{
+.stack__add-button {
     -webkit-border-radius: 2px;
     -moz-border-radius: 2px;
     border-radius: 2px;
     z-index: 20;
 }
 
-.stack__add-bar 
-{
+.stack__add-bar {
     position: relative;
     height: 10px;
     z-index: 15;
 }
 
-.stack__add-bar .stack__add-button
-{
+.stack__add-bar .stack__add-button {
     position: absolute;
     left: 50%;
     top: 50%;
     margin: -15px 0 0 -15px;
     opacity: 0;
-
     transition: opacity .0s ease-in-out;
     -moz-transition: opacity .0s ease-in-out;
     -webkit-transition: opacity .0s ease-in-out;
-
     -webkit-box-shadow: 0px 0px 10px 0px rgba(0,0,0,0.25);
     -moz-box-shadow: 0px 0px 10px 0px rgba(0,0,0,0.25);
     box-shadow: 0px 0px 10px 0px rgba(0,0,0,0.25);
 }
 
-.stack__add-bar:hover 
-{
+.stack__add-bar:hover {
     margin: -10px 0;
     height: 30px;
 }
 
-.stack__item:first-child .stack__add-bar--top:hover 
-{
+.stack__item:first-child .stack__add-bar--top:hover {
     margin: 0 0 -10px;
     height: 20px;
 }
 
-.stack__add-bar:hover .stack__add-button
-{
+.stack__add-bar:hover .stack__add-button {
     opacity: 1;
-
     transition-duration: .25s;
     -moz-transition-duration: .25s;
     -webkit-transition-duration: .25s;
-
     -webkit-transition-delay: .05s;
     -moz-transition-delay: .05s;
     transition-delay: .05s;
 }
 
-.stack__item.ui-sortable-placeholder 
-{
+.stack__item.ui-sortable-placeholder {
     top: 5px;
     height: 2px !important;
     visibility: visible !important;
     background-color: #2e8aea;
 }
 
-.stack__sortable-helper 
-{
+.stack__sortable-helper {
     overflow: visible;
 }
 
-.stack__sortable-helper > div
-{
+.stack__sortable-helper > div {
     font-size: 20px;
     position: absolute;
     top: -20px;
     left: 50%;
-
     width: 40px;
     height: 40px;
     line-height: 40px;
     text-align: center;
     background-color: #2e8aea;
     color: white;
-
     margin: 0 0 0 -20px;
-
     -webkit-border-radius: 2px;
     -moz-border-radius: 2px;
     border-radius: 2px;
-
     -webkit-box-shadow: 0px 0px 10px 0px rgba(0,0,0,0.25);
     -moz-box-shadow: 0px 0px 10px 0px rgba(0,0,0,0.25);
     box-shadow: 0px 0px 10px 0px rgba(0,0,0,0.25);
 }
 
-.stack__buttons .no-overflow 
-{
+.stack__buttons .no-overflow {
     max-width: 100%;
     overflow: hidden;
-}
+}
diff --git a/...Umbraco.StackedContent/Web/UI/App_Plugins/StackedContent/js/stackedcontent.controllers.js b/...Umbraco.StackedContent/Web/UI/App_Plugins/StackedContent/js/stackedcontent.controllers.js
@@ -128,7 +128,7 @@
         } else if ($scope.model.config.singleItemMode === "1") {
 
             // Initialise single item mode model
-            innerContentService.createDefaultDbModel($scope.model.config.contentTypes[0]).then(function(v) {
+            innerContentService.createDefaultDbModel($scope.model.config.contentTypes[0]).then(function (v) {
 
                 $scope.model.value = [v];
 
@@ -141,7 +141,6 @@
                 }
 
             });
-
 
         } else {
-Original file line number
+Diff line change
@@ Expand Up @@
                         var rawValue = JsonConvert.DeserializeObject<JArray>(source.ToString());
                         return ConvertInnerContentDataToSource(rawValue, null, 1, preview);
                     }
                 }
                 catch (Exception e)
                 {
@@ Expand Down @@