Merge pull request #14 from dougludlow/emptytitle

Use url as name when Page Title is left empty

Author: rasmusjp

Gruntfile.js

@@ -33,14 +33,14 @@ module.exports = function (grunt) {
             nuget: {
                 expand: true,
                 cwd: '<%= basePath %>',
-                src: '**',
+                src: '<%= basePath %>',
                 dest: 'tmp/nuget/content/'
             },
 
             umbraco: {
                 expand: true,
                 cwd: '<%= basePath %>/',
-                src: '**',
+                src: '<%= basePath %>',
                 dest: 'tmp/umbraco/'
             },
 

src/RJP.MultiUrlPicker/App_Plugins/RJP.MultiUrlPicker/MultiUrlPicker.js

@@ -10,14 +10,7 @@ angular.module("umbraco").controller("RJP.MultiUrlPickerController", function($s
 
   if( $scope.model.value ) {
     _.each($scope.model.value, function( item, i ) {
-      $scope.renderModel.push({
-          name: item.name
-        , id: item.id
-        , url: item.url
-        , target: item.target
-        , isMedia: item.isMedia
-        , icon: item.icon || 'icon-link'
-      })
+      $scope.renderModel.push(new Link(item))
       if( item.id ) {
         (item.isMedia ? mediaIds : documentIds).push( item.id )
       }
@@ -107,14 +100,7 @@ angular.module("umbraco").controller("RJP.MultiUrlPickerController", function($s
 
 
   $scope.onContentSelected = function(e) {
-    var link = {
-          id: e.id
-        , name: e.name
-        , url: e.url
-        , target: e.target
-        , isMedia: e.isMedia
-        , icon: 'icon-link'
-    }
+    var link = new Link(e);
 
     if( e.index != null ) {
       $scope.renderModel[ e.index ] = link
@@ -129,4 +115,13 @@ angular.module("umbraco").controller("RJP.MultiUrlPickerController", function($s
     $scope.model.value = $scope.renderModel
     dialogService.closeAll()
   }
+
+  function Link(link) {
+      this.id = link.id;
+      this.name = link.name || link.url;
+      this.url = link.url;
+      this.target = link.target;
+      this.isMedia = link.isMedia;
+      this.icon = link.icon || 'icon-link';
+  }
 })

src/RJP.MultiUrlPicker/test/spec/MultiUrlPickerController.spec.js

@@ -27,7 +27,6 @@ describe('RJP.MultiUrlPickerController', function () {
     }));
 
     it("doesn't try to get entity when id is less than 1", inject(function ($q, entityResource) {
-
         var e = {
             id: -20,
             name: 'Recycle Bin',
@@ -51,4 +50,41 @@ describe('RJP.MultiUrlPickerController', function () {
 
         expect(entityResource.getById).not.toHaveBeenCalled();
     }));
+
+    it('uses the url if the Page Title field is left empty', function () {
+        var e = {
+            id: null,
+            name: '',
+            url: 'http://www.google.com/',
+            isMedia: false,
+            icon: ''
+        };
+
+        createController();
+
+        expect($scope.renderModel.length).toBe(0);
+
+        $scope.onContentSelected(e);
+
+        expect($scope.renderModel.length).toBe(1);
+        expect($scope.renderModel[0].name).toBe(e.url);
+    });
+
+    it('shows the url is name is empty when loaded from the database', function () {
+
+        var link = {
+            id: 1,
+            name: '',
+            url: 'http://www.google.com/',
+            isMedia: false,
+            icon: 'icon-link'
+        };
+
+        $scope.model.value = [link];
+
+        createController();
+
+        expect($scope.renderModel.length).toBe(1);
+        expect($scope.renderModel[0].name).toBe(link.url);
+    })
 });