Merge pull request angular-ui#1815 from mehanika/share-button

cthrax · cthrax · commit 43b850f84945 · 2016-04-18T16:23:44.000-06:00
Inline template in map-control directive - Documentation
diff --git a/app/views/examples/map-control/index.html b/app/views/examples/map-control/index.html
@@ -1,8 +1,18 @@
 <div id="map_canvas" ng-controller="mainCtrl">
+  <style type="text/css">
+  .btn-warning {
+       background-color:#EC971F;
+     }
+  </style>
     <script type="text/ng-template" id="control.tpl.html">
         <button class="btn btn-sm btn-primary" ng-class="{'btn-warning': danger}" ng-click="controlClick()">{{controlText}}</button>
     </script>
     <ui-gmap-google-map center="map.center" zoom="map.zoom" draggable="true" options="options">
         <ui-gmap-map-control template="control.tpl.html" position="top-right" controller="controlCtrl" index="-1"></ui-gmap-map-control>
+        <ui-gmap-map-control>
+          <div ng-controller="inlineControlCtrl">
+              <button class="btn btn-sm btn-primary" ng-class="{'btn-warning': danger}" ng-click="controlClick()">{{controlText}}</button>
+          </div>
+        </ui-gmap-map-control>
     </ui-gmap-google-map>
-</div>
+</div>
diff --git a/app/views/examples/map-control/script.js b/app/views/examples/map-control/script.js
@@ -10,4 +10,13 @@ angular.module('appMaps', ['uiGmapgoogle-maps'])
             $scope.danger = !$scope.danger;
             alert('custom control clicked!');
         };
-    });
+    })
+    .controller('inlineControlCtrl',function($scope){
+      $scope.controlText = 'I\'m a custom control from inline template';
+      $scope.danger = false;
+      $scope.controlClick = function () {
+          $scope.danger = !$scope.danger;
+          alert('custom control from inline template clicked!');
+      };
+
+    });
diff --git a/bower.json b/bower.json
@@ -14,7 +14,7 @@
     "json3": "~3.2.4",
     "jquery": "~2.1.x",
     "es5-shim": "~2.0.8",
-    "share-button": "~0.0.3",
+    "share-button": "git+https://github.com/carrot/share-button.git#0.0.3",
     "bootstrap": "~3.2.0",
     "lodash": ">=2.4.1",
     "highlightjs": "~8.7.0",
