Merge branch 'Vrijdagonline-master'

rasmusjp · rasmusjp · commit 9f9845c3e69c · 2015-04-07T09:31:20.000+02:00
Conflicts:
	src/RJP.MultiUrlPicker/App_Plugins/RJP.MultiUrlPicker/MultiUrlPicker.js
diff --git a/src/RJP.MultiUrlPicker/App_Plugins/RJP.MultiUrlPicker/MultiUrlPicker.js b/src/RJP.MultiUrlPicker/App_Plugins/RJP.MultiUrlPicker/MultiUrlPicker.js
@@ -113,6 +113,7 @@ angular.module("umbraco").controller("RJP.MultiUrlPickerController", function($s
     }
 
     $scope.model.value = $scope.renderModel
+    dialogService.close()
   }
 
   function Link(link) {

Original file line number	Diff line number	Diff line change
`@@ -113,6 +113,7 @@ angular.module("umbraco").controller("RJP.MultiUrlPickerController", function($s`
`113`	`113`	`}`
`114`	`114`
`115`	`115`	`$scope.model.value = $scope.renderModel`
	`116`	`+ dialogService.close()`
`116`	`117`	`}`
`117`	`118`
`118`	`119`	`function Link(link) {`