From cafeb6d8c6b94d5c10854d5c795870d8f8da3167 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Mon, 25 Nov 2013 11:58:01 +1100
Subject: [PATCH] Fixes: U4-3661 Unable to Create Color Picker DataType &
 U4-3645 Media Picker Umbraco 7 can select multiple

---
 .../src/common/resources/datatype.resource.js                 | 4 ++--
 .../propertyeditors/mediapicker/mediapicker.controller.js     | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/resources/datatype.resource.js b/src/Umbraco.Web.UI.Client/src/common/resources/datatype.resource.js
index b38fa4d0a0..91537c4e7b 100644
--- a/src/Umbraco.Web.UI.Client/src/common/resources/datatype.resource.js
+++ b/src/Umbraco.Web.UI.Client/src/common/resources/datatype.resource.js
@@ -22,7 +22,7 @@ function dataTypeResource($q, $http, umbDataFormatter, umbRequestHelper) {
          *        alert('its gone!');
          *    });
          * </pre> 
-         * 
+         *  
          * @param {String} editorAlias string alias of editor type to retrive prevalues configuration for
          * @param {Int} id id of datatype to retrieve prevalues for        
          * @returns {Promise} resourcePromise object.
@@ -40,7 +40,7 @@ function dataTypeResource($q, $http, umbDataFormatter, umbRequestHelper) {
                        "dataTypeApiBaseUrl",
                        "GetPreValues",
                        [{ editorAlias: editorAlias }, { dataTypeId: dataTypeId }])),
-               'Failed to retreive pre values for editor id ' + editorId);
+               'Failed to retreive pre values for editor alias ' + editorAlias);
         },
 
         /**
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js
index 2a52a8da98..59fa1819ef 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js
@@ -8,7 +8,7 @@ angular.module('umbraco').controller("Umbraco.PropertyEditors.MediaPickerControl
 
         function setupViewModel() {
             $scope.images = [];
-            $scope.ids = [];
+            $scope.ids = []; 
 
             if ($scope.model.value) {
                 $scope.ids = $scope.model.value.split(',');