Merge pull request #8 from janvanhelvoort/develop

Clean-up for final release

Source/Qvision.Umbraco.PollIt/Attributes/CamelCaseAttribute.cs

@@ -12,15 +12,15 @@ class CamelCaseAttribute : Attribute, IControllerConfiguration
         public void Initialize(HttpControllerSettings currentConfiguration, HttpControllerDescriptor currentDescriptor)
         {
             var currentFormatter = currentConfiguration.Formatters.OfType<JsonMediaTypeFormatter>().Single();
-            
+
             // remove the current formatter
             currentConfiguration.Formatters.Remove(currentFormatter);
 
             var camelFormatter = new JsonMediaTypeFormatter
             {
                 SerializerSettings = { ContractResolver = new CamelCasePropertyNamesContractResolver() }
             };
-            
+
             // add the camel case formatter
             currentConfiguration.Formatters.Add(camelFormatter);
         }

Source/Qvision.Umbraco.PollIt/Client/backoffice/dashboard/dashboard.html

@@ -5,7 +5,7 @@
         <ul class="thumbnails">
             <li class="span4" ng-repeat="question in content.questions">
                 <div style="margin-right: 20px; padding: 20px;">
-                    <a href ng-click="navigate(question.id)" title="{{question.name}}">
+                    <a href="javascript:;" ng-click="navigate(question.id)" title="{{question.name}}">
                         <span style="font-weight: bold;">{{question.name}}</span>
                         <div class="umb-listview" ng-if="question.answers.length > 0">
                             <table class="table table-striped">

Source/Qvision.Umbraco.PollIt/Client/backoffice/overlays/picker/picker.overlay.html

@@ -1,6 +1,6 @@
 <div ng-controller="PollIt.PickerOverlayController">
 
-    <umb-load-indicator ng-if="isLoading"/>
+    <umb-load-indicator ng-if="isLoading" />
 
     <!-- FILTER -->
     <div class="umb-control-group -no-border" ng-if="!isLoading && content.questions.length !== 0">
@@ -9,7 +9,6 @@
             <input type="text"
                    class="-full-width-input"
                    ng-model="content.filterTerm"
-                   class="umb-search-field search-query search-input input-block-level"
                    localize="placeholder"
                    placeholder="@placeholders_filter"
                    umb-auto-focus>
@@ -21,7 +20,7 @@
             <a href="" title="{{ question.name }}">
                 <i class="icon-poll"></i>
                 <span class="menu-label">
-                    {{question.name}}                    
+                    {{question.name}}
                 </span>
             </a>
         </li>

Source/Qvision.Umbraco.PollIt/Client/backoffice/poll/delete.controller.js

@@ -40,7 +40,7 @@
                 for (var i = 0; i < err.data.notifications.length; i++) {
                     notificationsService.showNotification(err.data.notifications[i]);
                 }
-            };
+            }
         });
 
         return true;

Source/Qvision.Umbraco.PollIt/Client/backoffice/poll/delete.html

@@ -4,6 +4,6 @@
             <localize key="defaultdialogs_confirmdelete">Are you sure you want to delete</localize> <strong>{{currentNode.name}}</strong>?
         </p>
 
-        <umb-confirm on-confirm="performDelete" on-cancel="cancel"/>        
+        <umb-confirm on-confirm="performDelete" on-cancel="cancel" />
     </div>
 </div>

Source/Qvision.Umbraco.PollIt/Client/backoffice/poll/edit.controller.js

@@ -57,7 +57,7 @@
             }, function (result) {
                 notificationsService.error(result.data.message);
                 $scope.page.saveButtonState = "error";
-            });;
+            });
         }
     };
 }

Source/Qvision.Umbraco.PollIt/Client/backoffice/poll/edit.html

@@ -1,10 +1,8 @@
 <div ng-controller="PollIt.EditController">
     <form name="contentForm" novalidate val-form-manager>
-
         <umb-load-indicator ng-if="page.isLoading"></umb-load-indicator>
 
         <umb-editor-view ng-if="!page.isLoading">
-
             <umb-editor-header name="model.question.name" navigation="page.navigation" hide-icon="true" hide-description="true" hide-alias="true"></umb-editor-header>
 
             <umb-editor-container class="form-horizontal">
@@ -14,7 +12,7 @@
             <umb-editor-footer>
                 <umb-editor-footer-content-right>
                     <umb-button action="save()" type="button" button-style="success" state="page.saveButtonState" shortcut="ctrl+s" label="Save"
-                        label-key="buttons_save" disabled="page.saveButtonState === 'busy'" />
+                                label-key="buttons_save" disabled="page.saveButtonState === 'busy'" />
                 </umb-editor-footer-content-right>
             </umb-editor-footer>
         </umb-editor-view>

Source/Qvision.Umbraco.PollIt/Client/backoffice/poll/subviews/content/content.controller.js

@@ -33,7 +33,7 @@
                 today: "icon-locate"
             }
         }
-    }
+    };
 
     $scope.startDatePicker = { view: 'datepicker', value: $scope.model.question.startDate, config: $.extend({}, $scope.config.datePicker) };
     $scope.endDatePicker = { view: 'datepicker', value: $scope.model.question.endDate, config: $.extend({}, $scope.config.datePicker) };

Source/Qvision.Umbraco.PollIt/Client/backoffice/propertyEditors/picker/picker.controller.js

@@ -1,5 +1,5 @@
 function PickerController($scope, localizationService, pollItResource) {
-    $scope.content = { selection: null, error: null }
+    $scope.content = { selection: null, error: null };
 
     if ($scope.model.value) {
         pollItResource.getQuestionById($scope.model.value).then(function(result) {
@@ -32,14 +32,14 @@
                     $scope.content.pollPickerOverlay = null;
                     $scope.content.error = null;
                 }
-            }
+            };
         }
-    }
+    };
 
     $scope.remove = function () {
         $scope.content.selection = null;
         $scope.model.value = null;
-    }
+    };
 }
 
 angular.module("umbraco").controller("PollIt.PickerController", PickerController);

Source/Qvision.Umbraco.PollIt/Client/backoffice/propertyEditors/picker/picker.html

@@ -2,15 +2,15 @@
 
     <umb-load-indicator ng-if="isLoading" />
 
-    <umb-node-preview ng-if="content.selection.name" name="content.selection.name" icon="icon-poll" allow-remove="true" on-remove="remove()"/>
-    
-    <a href="" ng-if="!content.selection.name" class="umb-node-preview-add" ng-click="openPollPicker()" prevent-default>
+    <umb-node-preview ng-if="content.selection.name" name="content.selection.name" icon="icon-poll" allow-remove="true" on-remove="remove()" />
+
+    <a href="javascript:;" ng-if="!content.selection.name" class="umb-node-preview-add" ng-click="openPollPicker()" prevent-default>
         <localize key="general_add">Add</localize>
     </a>
 
     <div ng-if="content.error" class="alert alert-warning">
         {{ content.error }}
     </div>
 
-    <umb-overlay ng-if="content.pollPickerOverlay.show" model="content.pollPickerOverlay" view="content.pollPickerOverlay.view" position="right"/>    
+    <umb-overlay ng-if="content.pollPickerOverlay.show" model="content.pollPickerOverlay" view="content.pollPickerOverlay.view" position="right" />
 </div>

Source/Qvision.Umbraco.PollIt/Controllers/TreeControllers/PollTreeController.cs

@@ -21,7 +21,7 @@ public class PollTreeController : TreeController
 
         protected override TreeNodeCollection GetTreeNodes(string id, FormDataCollection queryStrings)
         {
-            TreeNodeCollection nodes = new TreeNodeCollection();
+            var nodes = new TreeNodeCollection();
 
             if (id.Equals(this.rootId))
             {
@@ -39,7 +39,7 @@ protected override TreeNodeCollection GetTreeNodes(string id, FormDataCollection
 
         protected override MenuItemCollection GetMenuForNode(string id, FormDataCollection queryStrings)
         {
-            MenuItemCollection collection = new MenuItemCollection();
+            var collection = new MenuItemCollection();
 
             if (id.Equals(this.rootId))
             {

Source/Qvision.Umbraco.PollIt/Migrations/InitialMigration.cs

@@ -23,7 +23,7 @@ public InitialMigration(ISqlSyntaxProvider sqlSyntax, ILogger logger) : base(sql
         public override void Up()
         {
             if (!this.databaseSchema.TableExist(TableConstants.Questions.TableName))
-            {                
+            {
                 this.Create.Table(TableConstants.Questions.TableName)
                     .WithColumn("Id").AsInt32().NotNullable()
                         .PrimaryKey("PK_poll_questions").Identity()
@@ -58,7 +58,7 @@ public override void Up()
                         .PrimaryKey("PK_poll_responses").Identity()
                     .WithColumn("ResponseDate").AsDateTime().NotNullable()
                     .WithColumn("QuestionId").AsInt32().NotNullable()
-                    .WithColumn("AnswerId").AsInt32().NotNullable();              
+                    .WithColumn("AnswerId").AsInt32().NotNullable();
 
                 this.Create.ForeignKey("QuestionId_Response")
                     .FromTable(TableConstants.Responses.TableName).ForeignColumn("QuestionId")

Source/Qvision.Umbraco.PollIt/Models/Answer.cs

@@ -1,6 +1,6 @@
 namespace Qvision.PollIt.Models
 {
-    using System.Collections.Generic;  
+    using System.Collections.Generic;
 
     public class Answer
     {

Source/Qvision.Umbraco.PollIt/Models/Pocos/Answer.cs

@@ -7,7 +7,7 @@
     /// <summary>
     /// The answer.
     /// </summary>
-    [TableName(TableConstants.Answers.TableName)]    
+    [TableName(TableConstants.Answers.TableName)]
     public class Answer
     {
         /// <summary>
@@ -22,7 +22,7 @@ public class Answer
 
         /// <summary>
         /// Gets or sets the answer.
-        /// </summary>        
+        /// </summary>
         public string Value { get; set; }
 
         /// <summary>

Source/Qvision.Umbraco.PollIt/Models/Pocos/Question.cs

@@ -10,7 +10,7 @@
     /// <summary>
     /// The poll question.
     /// </summary>
-    [TableName(TableConstants.Questions.TableName)]    
+    [TableName(TableConstants.Questions.TableName)]
     public class Question
     {
         /// <summary>

Source/Qvision.Umbraco.PollIt/Models/Question.cs

@@ -15,9 +15,9 @@ public class Question
 
         public DateTime? EndDate { get; set; }
 
-        public DateTime CreatedDate { get; set; }       
+        public DateTime CreatedDate { get; set; }
 
-        public IEnumerable<Answer> Answers { get; set; }        
+        public IEnumerable<Answer> Answers { get; set; }
     }
 }
 

Source/Qvision.Umbraco.PollIt/Models/Repositories/AnswerRepository.cs

@@ -36,7 +36,7 @@ public Answer Save(Answer answer)
         {
             if (answer != null && answer.Id > 0)
             {
-                this.Database.Update(answer);                
+                this.Database.Update(answer);
             }
 
             return answer;

Source/Qvision.Umbraco.PollIt/Models/Repositories/ResponseRepository.cs

@@ -41,7 +41,7 @@ public bool Delete(int id)
 
         public bool DeleteByAnswerId(int id)
         {
-            var query = new Sql().Where<Response>(response => response.AnswerId.Equals(id), this.SqlSyntax);            
+            var query = new Sql().Where<Response>(response => response.AnswerId.Equals(id), this.SqlSyntax);
 
             return this.Database.Delete<Response>(query) > -1;
         }

Source/Qvision.Umbraco.PollIt/PollItContext.cs

@@ -19,7 +19,7 @@ public class PollItContext
         /// </summary>
         private PollItContext()
         {
-            this.AmountOfAnswers = this.GetAppSetting<int>(Constants.AppSettings.AmountOfAnswers, 6);
+            this.AmountOfAnswers = this.GetAppSetting(Constants.AppSettings.AmountOfAnswers, 6);
             instance = this;
         }
 

Source/Qvision.Umbraco.PollIt/Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.9.1.*")]
-[assembly: AssemblyFileVersion("0.9.1.*")]
+[assembly: AssemblyVersion("0.9.2.*")]
+[assembly: AssemblyFileVersion("0.9.2s.*")]

Source/Qvision.Umbraco.PollIt/Services/PollItService.cs

@@ -46,7 +46,7 @@ public Question Vote(int questionId, int answerId)
 
             if (result != null)
             {
-                PollItCacheRefresher.ClearCache(questionId);                
+                PollItCacheRefresher.ClearCache(questionId);
             }
 
             return this.GetQuestion(questionId);

Source/Qvision.Umbraco.PollIt/Startup.cs

@@ -76,8 +76,8 @@ private void SetupSections(ApplicationContext applicationContext)
         /// Setup database.
         /// </summary>
         private void SetupMigration()
-        {            
-            var migrations = ApplicationContext.Current.Services.MigrationEntryService.GetAll(ApplicationConstants.ProductName);            
+        {
+            var migrations = ApplicationContext.Current.Services.MigrationEntryService.GetAll(ApplicationConstants.ProductName);
             var latestMigration = migrations.OrderByDescending(x => x.Version).FirstOrDefault();
 
             var currentVersion = latestMigration != null ? latestMigration.Version : new SemVersion(0, 0, 0);
@@ -135,7 +135,7 @@ private void ServerVariablesParserParsing(object sender, Dictionary<string, obje
                     { "postQuestionAnswer", urlHelper.GetUmbracoApiService<QuestionApiController>("PostAnswer") },
                     { "getQuestionResponsesById", urlHelper.GetUmbracoApiService<QuestionApiController>("GetResponses") },
 
-                    { "saveAnswer", urlHelper.GetUmbracoApiService<AnswerApiController>("Post") },                    
+                    { "saveAnswer", urlHelper.GetUmbracoApiService<AnswerApiController>("Post") },
                     { "deleteAnswer", urlHelper.GetUmbracoApiService<AnswerApiController>("Delete") },
 
                     { "AmountOfAnswers", PollItContext.Current.AmountOfAnswers }

appveyor.yml

@@ -1,7 +1,7 @@
 os: Visual Studio 2015
 
 # Version format
-version: 0.9.1.{build}
+version: 0.9.2.{build}
 
 cache:
   - Source\packages -> **\packages.config   # preserve "packages" directory in the root of build folder but will reset it if packages.config is modified