Merge branch 'development'

Author: johache

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "third_party/adapter"]
+	path = third_party/adapter
+	url = https://github.com/webrtc/adapter.git

Gruntfile.js

@@ -19,6 +19,8 @@ module.exports = function(grunt) {
 
       source: 'source',
 
+      googleAdapterPath: 'third_party/adapter/adapter.js',
+
       production: 'publish',
 
       bamboo: 'bamboo',
@@ -117,7 +119,21 @@ module.exports = function(grunt) {
           options: {
             // Task-specific options go here. 
             prefix: '@@',
-            includesDir: '<%= pluginInfoRoot %>/',
+            includesDir: '.',
+            processIncludeContents: function (includeContents, localVars, filePath) {
+              if (filePath.indexOf(grunt.config.get('googleAdapterPath')) != -1) {
+                // Indent file and indent Google's exports
+                return includeContents
+                  // Comment export
+                  .replace(/if \(typeof module \!\=\= 'undefined'\) \{(.|\n)*\}\n/gm, function(content) {
+                  return '/* Orginal exports removed in favor of AdapterJS custom export.\n' + content + '*/\n';
+                  })
+                  // Indent (2 spaces so far, to be updated as AJS evolves)
+                  .replace(/.*\n/g, function(line) { return '  ' + line; });
+              } else { // not Google's AJS
+                return includeContents;
+              }
+            },
           },
           // Files to perform replacements and includes with 
           src: [

bower.json

@@ -1,7 +1,7 @@
 {
     "name": "adapterjs",
     "description": "Creating a common API for WebRTC in the browser",
-    "version": "0.12.3",
+    "version": "0.13.0",
     "homepage": "https://temasys.github.io/",
     "author": {
         "name": "Temasys Communications Pte. Ltd.",

package.json

@@ -1,7 +1,7 @@
 {
   "name": "adapterjs",
   "description": "Creating a common API for WebRTC in the browser",
-  "version": "0.12.3",
+  "version": "0.13.0",
   "homepage": "https://temasys.github.io/",
   "author": {
     "name": "Temasys Communications Pte. Ltd.",