diff --git a/bower.json b/bower.json index ab6ad56..fce91c6 100644 --- a/bower.json +++ b/bower.json @@ -17,7 +17,6 @@ "html5-boilerplate": "~4.3.0", "requirejs": "~2.1.11", "less": "~1.7.0", - "backbone": "~1.1.2", "lodash": "~2.4.1", "jquery": "~2.1.0", "bluebird": "~1.2.3", diff --git a/public/img/button.jpg b/public/img/button.jpg new file mode 100644 index 0000000..c59514a Binary files /dev/null and b/public/img/button.jpg differ diff --git a/public/index.html b/public/index.html index a9b3b9b..6bbe020 100644 --- a/public/index.html +++ b/public/index.html @@ -12,9 +12,11 @@ - - - + + + + + -

Hello world! This is prototool.

+

Record all the audio

+
- + diff --git a/src/coffee/app.coffee b/src/coffee/app.coffee index d4ac60e..fb5a33c 100644 --- a/src/coffee/app.coffee +++ b/src/coffee/app.coffee @@ -1,2 +1,6 @@ define (require) -> - console.log('hello'); \ No newline at end of file + if (! Modernizr.getusermedia) + alert("Can't access your media :(") + return + + getUserMedia = require('getUserMedia') diff --git a/src/coffee/getUserMedia.coffee b/src/coffee/getUserMedia.coffee new file mode 100644 index 0000000..b067ea9 --- /dev/null +++ b/src/coffee/getUserMedia.coffee @@ -0,0 +1,3 @@ +define (require) -> + navigator.getUserMedia = navigator.getUserMedia || navigator.webkitGetUserMedia || navigator.mozGetUserMedia + return navigator.getUserMedia \ No newline at end of file diff --git a/src/coffee/main.coffee b/src/coffee/main.coffee index 62012d6..25f2796 100644 --- a/src/coffee/main.coffee +++ b/src/coffee/main.coffee @@ -9,42 +9,16 @@ requirejs.config baseUrl: "/js" paths: - jsx: BOWERPATH + "require-jsx/jsx" text: BOWERPATH + "requirejs-plugins/lib/text" async: BOWERPATH + "requirejs-plugins/src/async" json: BOWERPATH + "requirejs-plugins/src/json" - backbone: BOWERPATH + "backbone/backbone" lodash: BOWERPATH + "lodash/dist/lodash.underscore" jquery: BOWERPATH + "jquery/dist/jquery" bluebird: BOWERPATH + "bluebird/js/browser/bluebird" - react: BOWERPATH + "react/react" - JSXTransformer: BOWERPATH + "react/JSXTransformer" - bacon: BOWERPATH + "bacon/dist/Bacon" - "react-bacon": NODEPATH + "react-bacon/dist/react-bacon" - - shim: - backbone: - deps: [ - "jquery" - "lodash" - ] - exports: "Backbone" - - JSXTransformer: - exports: "JSXTransformer" - - "react-bacon": - deps: [ - "bacon" - "react" - ] urlArgs: (new Date()).getTime() # Disable caching # Add Google Maps shim -define "gmaps", ["async!//maps.google.com/maps/api/js?client=gme-colonyamericanhomes&v=3.exp&sensor=false"], -> - "use strict" - return window.google.maps - -require ['app'] \ No newline at end of file +define (require) -> + require ['app'] \ No newline at end of file diff --git a/src/less/app.less b/src/less/app.less new file mode 100644 index 0000000..74ba665 --- /dev/null +++ b/src/less/app.less @@ -0,0 +1,6 @@ +.button.record { + width: 200px; + height: 200px; + background: 0 0 url(/img/button.jpg) no-repeat; + background-size: contain; +} \ No newline at end of file