v1.8.0

tombatossals · Jan 19, 2016 · e293a2a · e293a2a
2 parents f31e2a0 + 026ddb5
commit e293a2a
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 11 deletions.
diff --git a/dist/angular-openlayers-directive.js b/dist/angular-openlayers-directive.js
@@ -1,5 +1,9 @@
 (function (root, factory) {
-    if (typeof define === 'function' && define.amd) {
+    if (typeof require === 'function' && typeof exports === 'object') {
+        // CommonJS
+        var ol = require('openlayers');
+        exports.angularOpenlayersDirective = factory(ol);
+    } else if (typeof define === 'function' && define.amd) {
         // AMD.
         define(['ol'], function (ol) {
             return root.angularOpenlayersDirective = factory(ol);

diff --git a/dist/angular-openlayers-directive.min.js b/dist/angular-openlayers-directive.min.js
diff --git a/dist/angular-openlayers-directive.min.no-header.js b/dist/angular-openlayers-directive.min.no-header.js
diff --git a/dist/angular-openlayers-directive.pre.js b/dist/angular-openlayers-directive.pre.js
@@ -1,5 +1,9 @@
 (function (root, factory) {
-    if (typeof define === 'function' && define.amd) {
+    if (typeof require === 'function' && typeof exports === 'object') {
+        // CommonJS
+        var ol = require('openlayers');
+        exports.angularOpenlayersDirective = factory(ol);
+    } else if (typeof define === 'function' && define.amd) {
         // AMD.
         define(['ol'], function (ol) {
             return root.angularOpenlayersDirective = factory(ol);

diff --git a/grunt/concat.js b/grunt/concat.js
@@ -1,7 +1,11 @@
 'use strict';
 
 var banner = '(function (root, factory) {\n' +
-             '    if (typeof define === \'function\' && define.amd) {\n' +
+             '    if (typeof require === \'function\' && typeof exports === \'object\') {\n' +
+             '        // CommonJS\n' +
+             '        var ol = require(\'openlayers\');\n' +
+             '        exports.angularOpenlayersDirective = factory(ol);\n' +
+             '    } else if (typeof define === \'function\' && define.amd) {\n' +
              '        // AMD.\n' +
              '        define([\'ol\'], function (ol) {\n' +
              '            return root.angularOpenlayersDirective = factory(ol);\n' +

diff --git a/package.json b/package.json
@@ -16,7 +16,11 @@
     "cli"
   ],
   "license": "MIT",
-  "dependencies": {},
+  "dependencies": {
+    "angular": "~1.4.8",
+    "angular-sanitize": "~1.4.8",
+    "openlayers": "~3.8"
+  },
   "devDependencies": {
     "grunt": "~0.4.5",
     "grunt-bower-task": "~0.4.0",
@@ -61,5 +65,5 @@
     "semantic-release": "semantic-release pre && npm publish && semantic-release post"
   },
   "main": "dist/angular-openlayers-directive",
-  "version": "1.7.0"
+  "version": "1.8.0"
 }