fixing examples and website

Author: nmccready

Gruntfile.coffee

@@ -82,6 +82,6 @@ module.exports = (grunt) ->
     'prod_build'
   ]
 
-  grunt.registerTask 's', ['server']
+  grunt.registerTask 's', ['open', 'connect:dist:keepalive']#just server prod release
 
   return

app/changelog.json

@@ -5,7 +5,8 @@
     <meta charset="utf-8" />
     <title>AngularJS Plunker</title>
     <script src="../../../vendor/scripts/angular.js" ></script>
-    <script src="../../../vendor/scripts/lodash.compat.js"></script>
+    <script src="../../../vendor/scripts/lodash.js"></script>
+    <script src="../../../vendor/scripts/angular-simple-logger.js"></script>
     <script src="../../../vendor/scripts/angular-google-maps.js"></script>
     <script src="example.js"></script>
     <style type="text/css">

app/views/examples/base/base.html

@@ -1,5 +1,5 @@
 <div id="map_canvas" ng-controller="mainCtrl">
     <ui-gmap-google-map center="map.center" zoom="map.zoom" draggable="true" options="options">
-        <ui-gmap-layer namespace="weather" type="WeatherLayer" show="showWeather"></ui-gmap-layer>
+        <ui-gmap-layer type="TransitLayer" show="show"></ui-gmap-layer>
     </ui-gmap-google-map>
 </div>

app/views/examples/layer/index.html

@@ -1,6 +1,6 @@
+'use strict';
 angular.module('appMaps', ['uiGmapgoogle-maps'])
     .controller('mainCtrl', function($scope) {
-        $scope.map = {center: {latitude: 51.219053, longitude: 4.404418 }, zoom: 4 };
-        $scope.options = {scrollwheel: false};
-        $scope.showWeather = true;
-    });
+        $scope.map = {center: {latitude: 38.90, longitude: -77.016 }, zoom: 12 };
+        $scope.show = true;
+    });

app/views/examples/layer/script.js

@@ -1,7 +1,14 @@
 angular.module('appMaps', ['uiGmapgoogle-maps'])
-    .controller('mainCtrl', function($scope) {
+    .config(function(uiGmapGoogleMapApiProvider) {
+      uiGmapGoogleMapApiProvider.configure({
+          libraries: 'geometry,visualization'
+      });
+    })
+    .controller('mainCtrl', function($scope, uiGmapGoogleMapApi) {
         $scope.map = {center: {latitude: 40.1451, longitude: -99.6680 }, zoom: 4, bounds: {}};
-        $scope.polylines = [
+        $scope.polylines = [];
+        uiGmapGoogleMapApi.then(function(){
+          $scope.polylines = [
             {
                 id: 1,
                 path: [
@@ -73,25 +80,7 @@ angular.module('appMaps', ['uiGmapgoogle-maps'])
                     offset: '25px',
                     repeat: '50px'
                 }]
-            },
-            {
-                id: 3,
-                path: google.maps.geometry.encoding.decodePath("uowfHnzb}Uyll@i|i@syAcx}Cpj[_wXpd}AhhCxu[ria@_{AznyCnt^|re@nt~B?m|Awn`G?vk`RzyD}nr@uhjHuqGrf^ren@"),
-                stroke: {
-                    color: '#4EAE47',
-                    weight: 3
-                },
-                editable: false,
-                draggable: false,
-                geodesic: false,
-                visible: true,
-                icons: [{
-                    icon: {
-                        path: google.maps.SymbolPath.BACKWARD_OPEN_ARROW
-                    },
-                    offset: '25px',
-                    repeat: '50px'
-                }]
             }
         ];
-    });
+        });
+    });

app/views/examples/polyline/script.js

@@ -12,10 +12,34 @@ <h1 class="page-header">Quickstart</h1>
                 <p>
                     Download <a href="https://raw.github.com/angular-ui/angular-google-maps/master/dist/angular-google-maps.js">angular-google-maps.js</a>
                     (<a href="https://raw.github.com/angular-ui/angular-google-maps/master/dist/angular-google-maps.min.js">minified version</a>) and put it with your other scripts.
-                    Alternatively, you can use Bower to install it automatically:
+                    Alternatively, you can use Bower, NPM, and Meteor to install it automatically:
                 </p>
-                <div hljs language="bash">bower install angular-google-maps</div>
-                <p>If not using Bower, you'll also need to fetch:
+                <ul>
+                  <li>
+                    <div>
+                      Bower:
+                      <div hljs language="bash">bower install angular-google-maps</div>
+                      <p>
+                        it is recommended to use <a href="https://github.com/ck86/main-bower-files">main-bower-files</a> with gulp, or grunt. As this will zip up all your dependencies in one nice vendor.js file.
+                      </p>
+                    </div>
+                  </li>
+                  <li>
+                    <div>
+                      NPM:
+                      <div hljs language="bash">npm install angular-google-maps</div>
+                      <p>
+                        it is recommended to use <a href="http://browserify.org/">browserify</a> or <a href="http://webpack.github.io/docs/">webpack</a> to bootstrap CommonJS dependencies.
+                      </p>
+                    </div>
+                  </li>
+                  <li>
+                    Meteor: see <a href="https://atmospherejs.com/angularui/angular-google-maps">here</a>
+                  </li>
+                </ul>
+
+
+                <p title="your living in the stone age">If not using Bower, NPM, or Meteor, or zero package managers you'll also need to fetch:
                   <ul>
                     <li>
                         <a href="http://lodash.com/" rel="external">lodash.js</a>
@@ -24,7 +48,7 @@ <h1 class="page-header">Quickstart</h1>
                         <a href="http://angularjs.org/" rel="external">angular.js</a>
                     </li>
                     <li>
-                        <a href="http://github.com/nmccready/angular-simple-logger/blob/master/dist/index.js" rel="external">angular-simple-logger/dist/index.js</a>
+                        <a href="http://github.com/nmccready/angular-simple-logger/blob/master/dist/angular-simple-logger.js" rel="external">angular-simple-logger/dist/angular-simple-logger.js</a>
                     </li>
                   </ul>
 
@@ -35,7 +59,8 @@ <h1 class="page-header">Quickstart</h1>
             </li>
             <li>
                 <p>Load lodash.js and angular-google.maps.js into your HTML page:</p>
-                <div hljs language="html" source="'<script src=\'/path/to/lodash[.min].js\'></script>\n<script src=\'/path/to/angular[.min].js\'></script>\n<script src=\'/path/to/angular-simple-logger/index[.min].js\'></script>\n<script src=\'/path/to/angular-google-maps[.min].js\'></script>'">
+                <div hljs language="html"
+                source="'<script src=\'/path/to/lodash[.min].js\'></script>\n<script src=\'/path/to/angular[.min].js\'></script>\n<script src=\'/path/to/angular-simple-logger/angular-simple-logger[.min].js\'></script>\n<script src=\'/path/to/angular-google-maps[.min].js\'></script>'">
                 </div>
             </li>
             <li>

app/views/use.html

@@ -17,13 +17,15 @@
     "share-button": "~0.0.3",
     "bootstrap": "~3.2.0",
     "lodash": ">=2.4.1",
-    "highlightjs": "~8.7.0"
+    "highlightjs": "~8.7.0",
+    "angular-simple-logger": "~0.1.4"
   },
   "devDependencies": {
     "angular-mocks": "1.4.5",
     "angular-scenario": "1.4.5"
   },
   "resolutions": {
-    "angular": "1.4.5"
+    "angular": "1.4.5",
+    "angular-simple-logger": "~0.1.4"
   }
 }

bower.json

@@ -6,6 +6,7 @@ vendor_js =
     '<%= yeoman.dist %>/vendor/scripts/lodash*'
     '<%= yeoman.dist %>/vendor/scripts/highlight*'
     '<%= yeoman.dist %>/vendor/scripts/angular.js'
+    '<%= yeoman.dist %>/vendor/scripts/angular-simple-logger.js'
     '<%= yeoman.dist %>/vendor/scripts/*.js'
     ]
   dest:

grunt/concat.coffee

@@ -22,7 +22,7 @@
     "grunt-contrib-htmlmin": "~0.3.0",
     "grunt-contrib-imagemin": "~0.8.1",
     "grunt-contrib-jshint": "~0.10.0",
-    "grunt-contrib-uglify": "~0.6.0",
+    "grunt-contrib-uglify": "~0.9.2",
     "grunt-contrib-watch": "~0.6.1",
     "grunt-gh-pages": "^0.9.1",
     "grunt-git-log-json": "nlaplante/grunt-git-log-json#develop",