fix($compile): swap keys and values for transclude definition object

Author: petebacondarwin

src/ng/compile.js

@@ -1868,33 +1868,39 @@ function $CompileProvider($provide, $$sanitizeUriProvider) {
           } else {
 
             var slots = createMap();
+
             $template = jqLite(jqLiteClone(compileNode)).contents();
 
             if (isObject(directiveValue)) {
 
-              // We have transclusion slots - collect them up and compile them and store their
-              // transclusion functions
+              // We have transclusion slots,
+              // collect them up, compile them and store their transclusion functions
               $template = [];
-              var slotNames = createMap();
+
+              var slotMap = createMap();
               var filledSlots = createMap();
 
-              // Parse the slot names: if they start with a ? then they are optional
-              forEach(directiveValue, function(slotName, key) {
-                var optional = (slotName.charAt(0) === '?');
-                slotName = optional ? slotName.substring(1) : slotName;
-                slotNames[key] = slotName;
+              // Parse the element selectors
+              forEach(directiveValue, function(elementSelector, slotName) {
+                // If an element selector starts with a ? then it is optional
+                var optional = (elementSelector.charAt(0) === '?');
+                elementSelector = optional ? elementSelector.substring(1) : elementSelector;
+
+                slotMap[elementSelector] = slotName;
+
                 // We explicitly assign `null` since this implies that a slot was defined but not filled.
                 // Later when calling boundTransclusion functions with a slot name we only error if the
                 // slot is `undefined`
                 slots[slotName] = null;
+
                 // filledSlots contains `true` for all slots that are either optional or have been
                 // filled. This is used to check that we have not missed any required slots
                 filledSlots[slotName] = optional;
               });
 
               // Add the matching elements into their slot
               forEach($compileNode.contents(), function(node) {
-                var slotName = slotNames[directiveNormalize(nodeName_(node))];
+                var slotName = slotMap[nodeName_(node)];
                 if (slotName) {
                   filledSlots[slotName] = true;
                   slots[slotName] = slots[slotName] || [];

test/ng/compileSpec.js

@@ -1,7 +1,7 @@
 'use strict';
 
 
-describe('$compile', function() {
+ddescribe('$compile', function() {
   function isUnknownElement(el) {
     return !!el.toString().match(/Unknown/);
   }
@@ -7660,7 +7660,7 @@ describe('$compile', function() {
             restrict: 'E',
             scope: {},
             transclude: {
-              boss: 'bossSlot'
+              bossSlot: 'boss'
             },
             template:
               '<div class="other" ng-transclude></div>'
@@ -7722,7 +7722,7 @@ describe('$compile', function() {
             restrict: 'E',
             scope: {},
             transclude: {
-              boss: 'bossSlot'
+              bossSlot: 'boss'
             },
             template:
               '<div class="other" ng-transclude></div>'
@@ -7751,8 +7751,8 @@ describe('$compile', function() {
             restrict: 'E',
             scope: {},
             transclude: {
-              minion: 'minionSlot',
-              boss: 'bossSlot'
+              minionSlot: 'minion',
+              bossSlot: 'boss'
             },
             template:
               '<div class="boss" ng-transclude="bossSlot"></div>' +
@@ -7784,8 +7784,8 @@ describe('$compile', function() {
             restrict: 'E',
             scope: {},
             transclude: {
-              minion: 'minionSlot',
-              boss: 'bossSlot'
+              minionSlot: 'minion',
+              bossSlot: 'boss'
             },
             template:
               '<ng-transclude class="boss" ng-transclude-slot="bossSlot"></ng-transclude>' +
@@ -7816,8 +7816,8 @@ describe('$compile', function() {
             restrict: 'E',
             scope: {},
             transclude: {
-              minion: 'minionSlot',
-              boss: 'bossSlot'
+              minionSlot: 'minion',
+              bossSlot: 'boss'
             },
             template:
               '<div class="boss" ng-transclude="bossSlot"></div>' +
@@ -7845,8 +7845,8 @@ describe('$compile', function() {
             restrict: 'E',
             scope: {},
             transclude: {
-              minion: 'minionSlot',
-              boss: '?bossSlot'
+              minionSlot: 'minion',
+              bossSlot: '?boss'
             },
             template:
               '<div class="boss" ng-transclude="bossSlot"></div>' +
@@ -7875,7 +7875,7 @@ describe('$compile', function() {
             restrict: 'E',
             scope: {},
             transclude: {
-              minion: 'minionSlot'
+              minionSlot: 'minion'
             },
             template:
               '<div class="boss" ng-transclude="bossSlot"></div>' +
@@ -7923,14 +7923,14 @@ describe('$compile', function() {
     });
 
 
-    it('should match against the normalized form of the element', function() {
+    it('should not normalize the element name', function() {
       module(function() {
         directive('foo', function() {
           return {
             restrict: 'E',
             scope: {},
             transclude: {
-              fooBar: 'fooBarSlot'
+              fooBarSlot: 'foo-bar'
             },
             template:
               '<div class="other" ng-transclude="fooBarSlot"></div>'
@@ -7956,8 +7956,8 @@ describe('$compile', function() {
             restrict: 'E',
             scope: {},
             transclude: {
-              minion: 'minionSlot',
-              boss: 'bossSlot'
+              minionSlot: 'minion',
+              bossSlot: 'boss'
             },
             template:
               '<div class="boss" ng-transclude="bossSlot"></div>' +
@@ -8011,8 +8011,8 @@ describe('$compile', function() {
             restrict: 'E',
             scope: {},
             transclude: {
-              minion: 'minionSlot',
-              boss: '?bossSlot'
+              minionSlot: 'minion',
+              bossSlot: '?boss'
             },
             link: function(s, e, a, c, transcludeFn) {
               capturedTranscludeFn = transcludeFn;
@@ -8038,8 +8038,8 @@ describe('$compile', function() {
             restrict: 'E',
             scope: {},
             transclude: {
-              minion: 'minionSlot',
-              boss: '?bossSlot'
+              minionSlot: 'minion',
+              bossSlot: '?boss'
             },
             template:
               '<div class="boss" ng-transclude="bossSlot">default boss content</div>' +