From a68c9b772498866b6e7a121cb490e85f1aa1d130 Mon Sep 17 00:00:00 2001 From: Frost Date: Tue, 29 Apr 2014 02:00:23 -0600 Subject: [PATCH] Moved all the files around and added livereloading to the extension. --- Gruntfile.js | 90 ++++++++++++++---- .../background/background.html | 1 + background.js => app/background/background.js | 2 +- app/background/chromereload.js | 23 +++++ app/background/devtoolsBackground.html | 5 + .../background/devtoolsBackground.js | 2 + bower.json => app/bower.json | 0 .../angular-mocks/.bower.json | 0 .../bower_components}/angular-mocks/README.md | 0 .../angular-mocks/angular-mocks.js | 0 .../angular-mocks/bower.json | 0 .../bower_components}/angular/.bower.json | 0 .../bower_components}/angular/angular.js | 0 .../bower_components}/angular/angular.min.js | 0 .../bower_components}/angular/bower.json | 0 .../bower_components}/d3/.bower.json | 0 .../bower_components}/d3/LICENSE | 0 .../bower_components}/d3/README.md | 0 .../bower_components}/d3/bower.json | 0 .../bower_components}/d3/d3.js | 0 .../bower_components}/d3/d3.min.js | 0 .../bower_components}/jquery/.bower.json | 0 .../bower_components}/jquery/.gitignore | 0 .../bower_components}/jquery/README.md | 0 .../bower_components}/jquery/bower.json | 0 .../bower_components}/jquery/component.json | 0 .../bower_components}/jquery/composer.json | 0 .../jquery/jquery-migrate.js | 0 .../jquery/jquery-migrate.min.js | 0 .../bower_components}/jquery/jquery.js | 0 .../bower_components}/jquery/jquery.min.js | 0 .../bower_components}/jquery/jquery.min.map | 0 .../bower_components}/jquery/package.json | 0 .../content-scripts}/README.md | 0 .../content-scripts}/inject.js | 1 + .../content-scripts}/lib/annotate.js | 0 .../content-scripts}/lib/decorate.js | 0 .../content-scripts}/lib/niceNames.js | 0 .../content-scripts}/lib/niceNames.spec.js | 0 .../content-scripts}/lib/popover.js | 0 .../content-scripts}/lib/summarizeModel.js | 0 .../content-scripts}/lib/summarizeObject.js | 0 .../content-scripts}/lib/throttle.js | 0 .../content-scripts}/lib/throttle.spec.js | 0 .../css/components/json-tree.css | 0 .../css/components/scope-tree.css | 0 .../devtools-panel}/css/components/slider.css | 0 .../css/components/watcher-list.css | 0 .../devtools-panel}/css/d3.css | 0 .../devtools-panel}/css/panel.css | 0 .../devtools-panel}/css/reset.css | 0 .../devtools-panel}/img/angular.png | Bin .../devtools-panel}/img/angular.pxm | Bin .../devtools-panel}/img/console.png | Bin .../devtools-panel}/img/deps.png | Bin .../img/glyphicons-halflings-white.png | Bin .../img/glyphicons-halflings.png | Bin .../devtools-panel}/img/inspect.png | Bin .../devtools-panel}/img/models.png | Bin .../devtools-panel}/img/options.png | Bin .../devtools-panel}/img/perf.png | Bin .../img/statusbarButtonGlyphs.png | Bin .../devtools-panel}/img/webstore-icon.png | Bin .../devtools-panel}/img/webstore-icon.pxm | Bin .../js/controllers/DepsCtrl.js | 0 .../js/controllers/ModelCtrl.js | 0 .../js/controllers/OptionsCtrl.js | 0 .../js/controllers/PerfCtrl.js | 0 .../devtools-panel}/js/directives/d3.js | 0 .../devtools-panel}/js/directives/jsonTree.js | 0 .../js/directives/scopeTree.js | 0 .../devtools-panel}/js/directives/slider.js | 0 .../devtools-panel}/js/directives/tabs.js | 0 .../js/directives/verticalSplit.js | 0 .../js/directives/watcherTree.js | 0 .../devtools-panel}/js/filters/first.js | 0 .../devtools-panel}/js/filters/precision.js | 0 .../devtools-panel}/js/filters/sortByTime.js | 0 .../js/lib/jquery-ui-1.8.21.custom.min.js | 0 .../devtools-panel}/js/panelApp.js | 0 .../devtools-panel}/js/services/appContext.js | 0 .../devtools-panel}/js/services/appCss.js | 0 .../devtools-panel}/js/services/appDeps.js | 0 .../js/services/appHighlight.js | 0 .../devtools-panel}/js/services/appInfo.js | 0 .../devtools-panel}/js/services/appModel.js | 0 .../devtools-panel}/js/services/appPerf.js | 0 .../devtools-panel}/js/services/appWatch.js | 0 .../js/services/chromeExtension.js | 0 .../devtools-panel}/js/services/filesystem.js | 0 .../devtools-panel}/panel.html | 2 +- .../devtools-panel}/panes/deps.html | 0 .../devtools-panel}/panes/help.html | 0 .../devtools-panel}/panes/model.html | 0 .../devtools-panel}/panes/options.html | 0 .../devtools-panel}/panes/perf.html | 0 manifest.json => app/manifest.json | 6 +- devtoolsBackground.html | 5 - karma-inject.conf.js | 6 +- package.json | 27 ++++-- scripts/inline.js | 6 +- 101 files changed, 137 insertions(+), 39 deletions(-) rename background.html => app/background/background.html (56%) rename background.js => app/background/background.js (97%) create mode 100644 app/background/chromereload.js create mode 100644 app/background/devtoolsBackground.html rename devtoolsBackground.js => app/background/devtoolsBackground.js (98%) rename bower.json => app/bower.json (100%) rename {bower_components => app/bower_components}/angular-mocks/.bower.json (100%) rename {bower_components => app/bower_components}/angular-mocks/README.md (100%) rename {bower_components => app/bower_components}/angular-mocks/angular-mocks.js (100%) rename {bower_components => app/bower_components}/angular-mocks/bower.json (100%) rename {bower_components => app/bower_components}/angular/.bower.json (100%) rename {bower_components => app/bower_components}/angular/angular.js (100%) rename {bower_components => app/bower_components}/angular/angular.min.js (100%) rename {bower_components => app/bower_components}/angular/bower.json (100%) rename {bower_components => app/bower_components}/d3/.bower.json (100%) rename {bower_components => app/bower_components}/d3/LICENSE (100%) rename {bower_components => app/bower_components}/d3/README.md (100%) rename {bower_components => app/bower_components}/d3/bower.json (100%) rename {bower_components => app/bower_components}/d3/d3.js (100%) rename {bower_components => app/bower_components}/d3/d3.min.js (100%) rename {bower_components => app/bower_components}/jquery/.bower.json (100%) rename {bower_components => app/bower_components}/jquery/.gitignore (100%) rename {bower_components => app/bower_components}/jquery/README.md (100%) rename {bower_components => app/bower_components}/jquery/bower.json (100%) rename {bower_components => app/bower_components}/jquery/component.json (100%) rename {bower_components => app/bower_components}/jquery/composer.json (100%) rename {bower_components => app/bower_components}/jquery/jquery-migrate.js (100%) rename {bower_components => app/bower_components}/jquery/jquery-migrate.min.js (100%) rename {bower_components => app/bower_components}/jquery/jquery.js (100%) rename {bower_components => app/bower_components}/jquery/jquery.min.js (100%) rename {bower_components => app/bower_components}/jquery/jquery.min.map (100%) rename {bower_components => app/bower_components}/jquery/package.json (100%) rename {content-scripts => app/content-scripts}/README.md (100%) rename {content-scripts => app/content-scripts}/inject.js (99%) rename {content-scripts => app/content-scripts}/lib/annotate.js (100%) rename {content-scripts => app/content-scripts}/lib/decorate.js (100%) rename {content-scripts => app/content-scripts}/lib/niceNames.js (100%) rename {content-scripts => app/content-scripts}/lib/niceNames.spec.js (100%) rename {content-scripts => app/content-scripts}/lib/popover.js (100%) rename {content-scripts => app/content-scripts}/lib/summarizeModel.js (100%) rename {content-scripts => app/content-scripts}/lib/summarizeObject.js (100%) rename {content-scripts => app/content-scripts}/lib/throttle.js (100%) rename {content-scripts => app/content-scripts}/lib/throttle.spec.js (100%) rename {devtools-panel => app/devtools-panel}/css/components/json-tree.css (100%) rename {devtools-panel => app/devtools-panel}/css/components/scope-tree.css (100%) rename {devtools-panel => app/devtools-panel}/css/components/slider.css (100%) rename {devtools-panel => app/devtools-panel}/css/components/watcher-list.css (100%) rename {devtools-panel => app/devtools-panel}/css/d3.css (100%) rename {devtools-panel => app/devtools-panel}/css/panel.css (100%) rename {devtools-panel => app/devtools-panel}/css/reset.css (100%) rename {devtools-panel => app/devtools-panel}/img/angular.png (100%) rename {devtools-panel => app/devtools-panel}/img/angular.pxm (100%) rename {devtools-panel => app/devtools-panel}/img/console.png (100%) rename {devtools-panel => app/devtools-panel}/img/deps.png (100%) rename {devtools-panel => app/devtools-panel}/img/glyphicons-halflings-white.png (100%) rename {devtools-panel => app/devtools-panel}/img/glyphicons-halflings.png (100%) rename {devtools-panel => app/devtools-panel}/img/inspect.png (100%) rename {devtools-panel => app/devtools-panel}/img/models.png (100%) rename {devtools-panel => app/devtools-panel}/img/options.png (100%) rename {devtools-panel => app/devtools-panel}/img/perf.png (100%) rename {devtools-panel => app/devtools-panel}/img/statusbarButtonGlyphs.png (100%) rename {devtools-panel => app/devtools-panel}/img/webstore-icon.png (100%) rename {devtools-panel => app/devtools-panel}/img/webstore-icon.pxm (100%) rename {devtools-panel => app/devtools-panel}/js/controllers/DepsCtrl.js (100%) rename {devtools-panel => app/devtools-panel}/js/controllers/ModelCtrl.js (100%) rename {devtools-panel => app/devtools-panel}/js/controllers/OptionsCtrl.js (100%) rename {devtools-panel => app/devtools-panel}/js/controllers/PerfCtrl.js (100%) rename {devtools-panel => app/devtools-panel}/js/directives/d3.js (100%) rename {devtools-panel => app/devtools-panel}/js/directives/jsonTree.js (100%) rename {devtools-panel => app/devtools-panel}/js/directives/scopeTree.js (100%) rename {devtools-panel => app/devtools-panel}/js/directives/slider.js (100%) rename {devtools-panel => app/devtools-panel}/js/directives/tabs.js (100%) rename {devtools-panel => app/devtools-panel}/js/directives/verticalSplit.js (100%) rename {devtools-panel => app/devtools-panel}/js/directives/watcherTree.js (100%) rename {devtools-panel => app/devtools-panel}/js/filters/first.js (100%) rename {devtools-panel => app/devtools-panel}/js/filters/precision.js (100%) rename {devtools-panel => app/devtools-panel}/js/filters/sortByTime.js (100%) rename {devtools-panel => app/devtools-panel}/js/lib/jquery-ui-1.8.21.custom.min.js (100%) rename {devtools-panel => app/devtools-panel}/js/panelApp.js (100%) rename {devtools-panel => app/devtools-panel}/js/services/appContext.js (100%) rename {devtools-panel => app/devtools-panel}/js/services/appCss.js (100%) rename {devtools-panel => app/devtools-panel}/js/services/appDeps.js (100%) rename {devtools-panel => app/devtools-panel}/js/services/appHighlight.js (100%) rename {devtools-panel => app/devtools-panel}/js/services/appInfo.js (100%) rename {devtools-panel => app/devtools-panel}/js/services/appModel.js (100%) rename {devtools-panel => app/devtools-panel}/js/services/appPerf.js (100%) rename {devtools-panel => app/devtools-panel}/js/services/appWatch.js (100%) rename {devtools-panel => app/devtools-panel}/js/services/chromeExtension.js (100%) rename {devtools-panel => app/devtools-panel}/js/services/filesystem.js (100%) rename {devtools-panel => app/devtools-panel}/panel.html (100%) rename {devtools-panel => app/devtools-panel}/panes/deps.html (100%) rename {devtools-panel => app/devtools-panel}/panes/help.html (100%) rename {devtools-panel => app/devtools-panel}/panes/model.html (100%) rename {devtools-panel => app/devtools-panel}/panes/options.html (100%) rename {devtools-panel => app/devtools-panel}/panes/perf.html (100%) rename manifest.json => app/manifest.json (78%) delete mode 100644 devtoolsBackground.html diff --git a/Gruntfile.js b/Gruntfile.js index fcc813b..32b521a 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -4,17 +4,28 @@ var markdown = require('marked'), module.exports = function(grunt) { + // Load grunt tasks automatically + require('load-grunt-tasks')(grunt); + + // Configurable paths + var config = { + app: 'app', + dist: 'dist', + manifest: grunt.file.readJSON('app/manifest.json') + }; + grunt.initConfig({ - pkg: grunt.file.readJSON('manifest.json'), + config: config, + pkg: grunt.file.readJSON('app/manifest.json'), changelog: { options: { dest: 'CHANGELOG.md', - versionFile: 'manifest.json' + versionFile: 'app/manifest.json' } }, bump: { options: { - file: 'manifest.json' + file: 'app/manifest.json' } }, markdown: { @@ -29,27 +40,74 @@ module.exports = function(grunt) { tagName: 'v<%= version %>', bump: false, // we have out own bump npm: false, - file: 'manifest.json' + file: 'app/manifest.json' } }, stage: { - files: ['CHANGELOG.md', 'pane/help.html'] + files: ['CHANGELOG.md', 'panes/help.html'] }, zip: { release: { src: [ - 'devtools-panel/css/*.css', - 'devtools-panel/img/**', - 'devtools-panel/js/**', - 'devtools-panel/panes/*.html', - 'devtools-panel/panel.html', + 'app/devtools-panel/css/*.css', + 'app/devtools-panel/img/**', + 'app/devtools-panel/js/**', + 'app/devtools-panel/panes/*.html', + 'app/devtools-panel/panel.html', 'LICENSE', - 'manifest.json', - 'background.html', - 'devtoolsBackground.html' + 'app/manifest.json', + 'app/background/**', + '!app/background/chromereload.js', + 'app/content-scripts/inject.build.js', + 'app/bower_components/angular/angular.js', + 'app/bower_components/angular-mocks/angular-mocks.js', + 'app/bower_components/jquery/jquery.js',, + 'app/bower_components/d3/d3.min.js' ], dest: 'batarang-release-' + Date.now() + '.zip' } + }, + watch: { + inline: { + options: { + livereload: true + }, + files: ['scripts/inline.js','app/content-scripts/**/*.js', '!app/content-scripts/inject.build.js'], + tasks: ['inline'] + }, + scripts: { + options: { + livereload: true + }, + files: ['app/devtools-panel/**/*.*','app/content-scripts/inject.build.js','app/background/**','app/content-scripts/**'], + tasks: [] + } + }, + // Grunt server and debug server setting + connect: { + options: { + port: 9000, + livereload: 35729, + // change this to '0.0.0.0' to access the server from outside + hostname: 'localhost' + }, + chrome: { + options: { + open: false, + base: [ + '<%= config.app %>' + ] + } + }, + test: { + options: { + open: false, + base: [ + 'test', + '<%= config.app %>' + ] + } + } } }); @@ -103,12 +161,10 @@ module.exports = function(grunt) { grunt.registerTask('inline', '...', require('./scripts/inline')); - grunt.loadNpmTasks('grunt-release'); - grunt.loadNpmTasks('grunt-zip'); - grunt.loadNpmTasks('grunt-conventional-changelog'); - grunt.registerTask('release', ['bump', 'markdown', 'changelog', 'release', 'zip']); grunt.registerTask('build', ['markdown', 'inline']); grunt.registerTask('default', ['build']); + grunt.registerTask('debug', ['connect:chrome', 'watch']) + }; diff --git a/background.html b/app/background/background.html similarity index 56% rename from background.html rename to app/background/background.html index 87f891a..16384c5 100644 --- a/background.html +++ b/app/background/background.html @@ -1,5 +1,6 @@ + \ No newline at end of file diff --git a/background.js b/app/background/background.js similarity index 97% rename from background.js rename to app/background/background.js index 5d74d5c..026f188 100644 --- a/background.js +++ b/app/background/background.js @@ -1,4 +1,4 @@ - +console.log("LOADING BATARANG BACKGROUND.JS"); // scopes need to be cached here so that if the devtools connects, // the list of scopes can be immediately populated // TODO: clear this on refresh ? diff --git a/app/background/chromereload.js b/app/background/chromereload.js new file mode 100644 index 0000000..de4e4b2 --- /dev/null +++ b/app/background/chromereload.js @@ -0,0 +1,23 @@ +'use strict'; + +// Reload client for Chrome Apps & Extensions. +// The reload client has a compatibility with livereload. +// WARNING: only supports reload command. + +var LIVERELOAD_HOST = 'localhost:'; +var LIVERELOAD_PORT = 35729; +var connection = new WebSocket('ws://' + LIVERELOAD_HOST + LIVERELOAD_PORT + '/livereload'); + +connection.onerror = function (error) { + console.log('reload connection got error' + JSON.stringify(error)); +}; + +connection.onmessage = function (e) { + if (e.data) { + var data = JSON.parse(e.data); + if (data && data.command === 'reload') { + + chrome.runtime.reload(); + } + } +}; diff --git a/app/background/devtoolsBackground.html b/app/background/devtoolsBackground.html new file mode 100644 index 0000000..ffb4b63 --- /dev/null +++ b/app/background/devtoolsBackground.html @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/devtoolsBackground.js b/app/background/devtoolsBackground.js similarity index 98% rename from devtoolsBackground.js rename to app/background/devtoolsBackground.js index 09ae536..d5a128e 100644 --- a/devtoolsBackground.js +++ b/app/background/devtoolsBackground.js @@ -7,6 +7,8 @@ * */ +console.log('Test') + var panels = chrome.devtools.panels; // The function below is executed in the context of the inspected page. diff --git a/bower.json b/app/bower.json similarity index 100% rename from bower.json rename to app/bower.json diff --git a/bower_components/angular-mocks/.bower.json b/app/bower_components/angular-mocks/.bower.json similarity index 100% rename from bower_components/angular-mocks/.bower.json rename to app/bower_components/angular-mocks/.bower.json diff --git a/bower_components/angular-mocks/README.md b/app/bower_components/angular-mocks/README.md similarity index 100% rename from bower_components/angular-mocks/README.md rename to app/bower_components/angular-mocks/README.md diff --git a/bower_components/angular-mocks/angular-mocks.js b/app/bower_components/angular-mocks/angular-mocks.js similarity index 100% rename from bower_components/angular-mocks/angular-mocks.js rename to app/bower_components/angular-mocks/angular-mocks.js diff --git a/bower_components/angular-mocks/bower.json b/app/bower_components/angular-mocks/bower.json similarity index 100% rename from bower_components/angular-mocks/bower.json rename to app/bower_components/angular-mocks/bower.json diff --git a/bower_components/angular/.bower.json b/app/bower_components/angular/.bower.json similarity index 100% rename from bower_components/angular/.bower.json rename to app/bower_components/angular/.bower.json diff --git a/bower_components/angular/angular.js b/app/bower_components/angular/angular.js similarity index 100% rename from bower_components/angular/angular.js rename to app/bower_components/angular/angular.js diff --git a/bower_components/angular/angular.min.js b/app/bower_components/angular/angular.min.js similarity index 100% rename from bower_components/angular/angular.min.js rename to app/bower_components/angular/angular.min.js diff --git a/bower_components/angular/bower.json b/app/bower_components/angular/bower.json similarity index 100% rename from bower_components/angular/bower.json rename to app/bower_components/angular/bower.json diff --git a/bower_components/d3/.bower.json b/app/bower_components/d3/.bower.json similarity index 100% rename from bower_components/d3/.bower.json rename to app/bower_components/d3/.bower.json diff --git a/bower_components/d3/LICENSE b/app/bower_components/d3/LICENSE similarity index 100% rename from bower_components/d3/LICENSE rename to app/bower_components/d3/LICENSE diff --git a/bower_components/d3/README.md b/app/bower_components/d3/README.md similarity index 100% rename from bower_components/d3/README.md rename to app/bower_components/d3/README.md diff --git a/bower_components/d3/bower.json b/app/bower_components/d3/bower.json similarity index 100% rename from bower_components/d3/bower.json rename to app/bower_components/d3/bower.json diff --git a/bower_components/d3/d3.js b/app/bower_components/d3/d3.js similarity index 100% rename from bower_components/d3/d3.js rename to app/bower_components/d3/d3.js diff --git a/bower_components/d3/d3.min.js b/app/bower_components/d3/d3.min.js similarity index 100% rename from bower_components/d3/d3.min.js rename to app/bower_components/d3/d3.min.js diff --git a/bower_components/jquery/.bower.json b/app/bower_components/jquery/.bower.json similarity index 100% rename from bower_components/jquery/.bower.json rename to app/bower_components/jquery/.bower.json diff --git a/bower_components/jquery/.gitignore b/app/bower_components/jquery/.gitignore similarity index 100% rename from bower_components/jquery/.gitignore rename to app/bower_components/jquery/.gitignore diff --git a/bower_components/jquery/README.md b/app/bower_components/jquery/README.md similarity index 100% rename from bower_components/jquery/README.md rename to app/bower_components/jquery/README.md diff --git a/bower_components/jquery/bower.json b/app/bower_components/jquery/bower.json similarity index 100% rename from bower_components/jquery/bower.json rename to app/bower_components/jquery/bower.json diff --git a/bower_components/jquery/component.json b/app/bower_components/jquery/component.json similarity index 100% rename from bower_components/jquery/component.json rename to app/bower_components/jquery/component.json diff --git a/bower_components/jquery/composer.json b/app/bower_components/jquery/composer.json similarity index 100% rename from bower_components/jquery/composer.json rename to app/bower_components/jquery/composer.json diff --git a/bower_components/jquery/jquery-migrate.js b/app/bower_components/jquery/jquery-migrate.js similarity index 100% rename from bower_components/jquery/jquery-migrate.js rename to app/bower_components/jquery/jquery-migrate.js diff --git a/bower_components/jquery/jquery-migrate.min.js b/app/bower_components/jquery/jquery-migrate.min.js similarity index 100% rename from bower_components/jquery/jquery-migrate.min.js rename to app/bower_components/jquery/jquery-migrate.min.js diff --git a/bower_components/jquery/jquery.js b/app/bower_components/jquery/jquery.js similarity index 100% rename from bower_components/jquery/jquery.js rename to app/bower_components/jquery/jquery.js diff --git a/bower_components/jquery/jquery.min.js b/app/bower_components/jquery/jquery.min.js similarity index 100% rename from bower_components/jquery/jquery.min.js rename to app/bower_components/jquery/jquery.min.js diff --git a/bower_components/jquery/jquery.min.map b/app/bower_components/jquery/jquery.min.map similarity index 100% rename from bower_components/jquery/jquery.min.map rename to app/bower_components/jquery/jquery.min.map diff --git a/bower_components/jquery/package.json b/app/bower_components/jquery/package.json similarity index 100% rename from bower_components/jquery/package.json rename to app/bower_components/jquery/package.json diff --git a/content-scripts/README.md b/app/content-scripts/README.md similarity index 100% rename from content-scripts/README.md rename to app/content-scripts/README.md diff --git a/content-scripts/inject.js b/app/content-scripts/inject.js similarity index 99% rename from content-scripts/inject.js rename to app/content-scripts/inject.js index 7154d04..d5d6e93 100644 --- a/content-scripts/inject.js +++ b/app/content-scripts/inject.js @@ -3,6 +3,7 @@ // but injects an 'instrumentation' script tag into the app context // confusing, right? + var instument = function instument (window) { // Helper to determine if the root 'ng' module has been loaded // window.angular may be available if the app is bootstrapped asynchronously, but 'ng' might diff --git a/content-scripts/lib/annotate.js b/app/content-scripts/lib/annotate.js similarity index 100% rename from content-scripts/lib/annotate.js rename to app/content-scripts/lib/annotate.js diff --git a/content-scripts/lib/decorate.js b/app/content-scripts/lib/decorate.js similarity index 100% rename from content-scripts/lib/decorate.js rename to app/content-scripts/lib/decorate.js diff --git a/content-scripts/lib/niceNames.js b/app/content-scripts/lib/niceNames.js similarity index 100% rename from content-scripts/lib/niceNames.js rename to app/content-scripts/lib/niceNames.js diff --git a/content-scripts/lib/niceNames.spec.js b/app/content-scripts/lib/niceNames.spec.js similarity index 100% rename from content-scripts/lib/niceNames.spec.js rename to app/content-scripts/lib/niceNames.spec.js diff --git a/content-scripts/lib/popover.js b/app/content-scripts/lib/popover.js similarity index 100% rename from content-scripts/lib/popover.js rename to app/content-scripts/lib/popover.js diff --git a/content-scripts/lib/summarizeModel.js b/app/content-scripts/lib/summarizeModel.js similarity index 100% rename from content-scripts/lib/summarizeModel.js rename to app/content-scripts/lib/summarizeModel.js diff --git a/content-scripts/lib/summarizeObject.js b/app/content-scripts/lib/summarizeObject.js similarity index 100% rename from content-scripts/lib/summarizeObject.js rename to app/content-scripts/lib/summarizeObject.js diff --git a/content-scripts/lib/throttle.js b/app/content-scripts/lib/throttle.js similarity index 100% rename from content-scripts/lib/throttle.js rename to app/content-scripts/lib/throttle.js diff --git a/content-scripts/lib/throttle.spec.js b/app/content-scripts/lib/throttle.spec.js similarity index 100% rename from content-scripts/lib/throttle.spec.js rename to app/content-scripts/lib/throttle.spec.js diff --git a/devtools-panel/css/components/json-tree.css b/app/devtools-panel/css/components/json-tree.css similarity index 100% rename from devtools-panel/css/components/json-tree.css rename to app/devtools-panel/css/components/json-tree.css diff --git a/devtools-panel/css/components/scope-tree.css b/app/devtools-panel/css/components/scope-tree.css similarity index 100% rename from devtools-panel/css/components/scope-tree.css rename to app/devtools-panel/css/components/scope-tree.css diff --git a/devtools-panel/css/components/slider.css b/app/devtools-panel/css/components/slider.css similarity index 100% rename from devtools-panel/css/components/slider.css rename to app/devtools-panel/css/components/slider.css diff --git a/devtools-panel/css/components/watcher-list.css b/app/devtools-panel/css/components/watcher-list.css similarity index 100% rename from devtools-panel/css/components/watcher-list.css rename to app/devtools-panel/css/components/watcher-list.css diff --git a/devtools-panel/css/d3.css b/app/devtools-panel/css/d3.css similarity index 100% rename from devtools-panel/css/d3.css rename to app/devtools-panel/css/d3.css diff --git a/devtools-panel/css/panel.css b/app/devtools-panel/css/panel.css similarity index 100% rename from devtools-panel/css/panel.css rename to app/devtools-panel/css/panel.css diff --git a/devtools-panel/css/reset.css b/app/devtools-panel/css/reset.css similarity index 100% rename from devtools-panel/css/reset.css rename to app/devtools-panel/css/reset.css diff --git a/devtools-panel/img/angular.png b/app/devtools-panel/img/angular.png similarity index 100% rename from devtools-panel/img/angular.png rename to app/devtools-panel/img/angular.png diff --git a/devtools-panel/img/angular.pxm b/app/devtools-panel/img/angular.pxm similarity index 100% rename from devtools-panel/img/angular.pxm rename to app/devtools-panel/img/angular.pxm diff --git a/devtools-panel/img/console.png b/app/devtools-panel/img/console.png similarity index 100% rename from devtools-panel/img/console.png rename to app/devtools-panel/img/console.png diff --git a/devtools-panel/img/deps.png b/app/devtools-panel/img/deps.png similarity index 100% rename from devtools-panel/img/deps.png rename to app/devtools-panel/img/deps.png diff --git a/devtools-panel/img/glyphicons-halflings-white.png b/app/devtools-panel/img/glyphicons-halflings-white.png similarity index 100% rename from devtools-panel/img/glyphicons-halflings-white.png rename to app/devtools-panel/img/glyphicons-halflings-white.png diff --git a/devtools-panel/img/glyphicons-halflings.png b/app/devtools-panel/img/glyphicons-halflings.png similarity index 100% rename from devtools-panel/img/glyphicons-halflings.png rename to app/devtools-panel/img/glyphicons-halflings.png diff --git a/devtools-panel/img/inspect.png b/app/devtools-panel/img/inspect.png similarity index 100% rename from devtools-panel/img/inspect.png rename to app/devtools-panel/img/inspect.png diff --git a/devtools-panel/img/models.png b/app/devtools-panel/img/models.png similarity index 100% rename from devtools-panel/img/models.png rename to app/devtools-panel/img/models.png diff --git a/devtools-panel/img/options.png b/app/devtools-panel/img/options.png similarity index 100% rename from devtools-panel/img/options.png rename to app/devtools-panel/img/options.png diff --git a/devtools-panel/img/perf.png b/app/devtools-panel/img/perf.png similarity index 100% rename from devtools-panel/img/perf.png rename to app/devtools-panel/img/perf.png diff --git a/devtools-panel/img/statusbarButtonGlyphs.png b/app/devtools-panel/img/statusbarButtonGlyphs.png similarity index 100% rename from devtools-panel/img/statusbarButtonGlyphs.png rename to app/devtools-panel/img/statusbarButtonGlyphs.png diff --git a/devtools-panel/img/webstore-icon.png b/app/devtools-panel/img/webstore-icon.png similarity index 100% rename from devtools-panel/img/webstore-icon.png rename to app/devtools-panel/img/webstore-icon.png diff --git a/devtools-panel/img/webstore-icon.pxm b/app/devtools-panel/img/webstore-icon.pxm similarity index 100% rename from devtools-panel/img/webstore-icon.pxm rename to app/devtools-panel/img/webstore-icon.pxm diff --git a/devtools-panel/js/controllers/DepsCtrl.js b/app/devtools-panel/js/controllers/DepsCtrl.js similarity index 100% rename from devtools-panel/js/controllers/DepsCtrl.js rename to app/devtools-panel/js/controllers/DepsCtrl.js diff --git a/devtools-panel/js/controllers/ModelCtrl.js b/app/devtools-panel/js/controllers/ModelCtrl.js similarity index 100% rename from devtools-panel/js/controllers/ModelCtrl.js rename to app/devtools-panel/js/controllers/ModelCtrl.js diff --git a/devtools-panel/js/controllers/OptionsCtrl.js b/app/devtools-panel/js/controllers/OptionsCtrl.js similarity index 100% rename from devtools-panel/js/controllers/OptionsCtrl.js rename to app/devtools-panel/js/controllers/OptionsCtrl.js diff --git a/devtools-panel/js/controllers/PerfCtrl.js b/app/devtools-panel/js/controllers/PerfCtrl.js similarity index 100% rename from devtools-panel/js/controllers/PerfCtrl.js rename to app/devtools-panel/js/controllers/PerfCtrl.js diff --git a/devtools-panel/js/directives/d3.js b/app/devtools-panel/js/directives/d3.js similarity index 100% rename from devtools-panel/js/directives/d3.js rename to app/devtools-panel/js/directives/d3.js diff --git a/devtools-panel/js/directives/jsonTree.js b/app/devtools-panel/js/directives/jsonTree.js similarity index 100% rename from devtools-panel/js/directives/jsonTree.js rename to app/devtools-panel/js/directives/jsonTree.js diff --git a/devtools-panel/js/directives/scopeTree.js b/app/devtools-panel/js/directives/scopeTree.js similarity index 100% rename from devtools-panel/js/directives/scopeTree.js rename to app/devtools-panel/js/directives/scopeTree.js diff --git a/devtools-panel/js/directives/slider.js b/app/devtools-panel/js/directives/slider.js similarity index 100% rename from devtools-panel/js/directives/slider.js rename to app/devtools-panel/js/directives/slider.js diff --git a/devtools-panel/js/directives/tabs.js b/app/devtools-panel/js/directives/tabs.js similarity index 100% rename from devtools-panel/js/directives/tabs.js rename to app/devtools-panel/js/directives/tabs.js diff --git a/devtools-panel/js/directives/verticalSplit.js b/app/devtools-panel/js/directives/verticalSplit.js similarity index 100% rename from devtools-panel/js/directives/verticalSplit.js rename to app/devtools-panel/js/directives/verticalSplit.js diff --git a/devtools-panel/js/directives/watcherTree.js b/app/devtools-panel/js/directives/watcherTree.js similarity index 100% rename from devtools-panel/js/directives/watcherTree.js rename to app/devtools-panel/js/directives/watcherTree.js diff --git a/devtools-panel/js/filters/first.js b/app/devtools-panel/js/filters/first.js similarity index 100% rename from devtools-panel/js/filters/first.js rename to app/devtools-panel/js/filters/first.js diff --git a/devtools-panel/js/filters/precision.js b/app/devtools-panel/js/filters/precision.js similarity index 100% rename from devtools-panel/js/filters/precision.js rename to app/devtools-panel/js/filters/precision.js diff --git a/devtools-panel/js/filters/sortByTime.js b/app/devtools-panel/js/filters/sortByTime.js similarity index 100% rename from devtools-panel/js/filters/sortByTime.js rename to app/devtools-panel/js/filters/sortByTime.js diff --git a/devtools-panel/js/lib/jquery-ui-1.8.21.custom.min.js b/app/devtools-panel/js/lib/jquery-ui-1.8.21.custom.min.js similarity index 100% rename from devtools-panel/js/lib/jquery-ui-1.8.21.custom.min.js rename to app/devtools-panel/js/lib/jquery-ui-1.8.21.custom.min.js diff --git a/devtools-panel/js/panelApp.js b/app/devtools-panel/js/panelApp.js similarity index 100% rename from devtools-panel/js/panelApp.js rename to app/devtools-panel/js/panelApp.js diff --git a/devtools-panel/js/services/appContext.js b/app/devtools-panel/js/services/appContext.js similarity index 100% rename from devtools-panel/js/services/appContext.js rename to app/devtools-panel/js/services/appContext.js diff --git a/devtools-panel/js/services/appCss.js b/app/devtools-panel/js/services/appCss.js similarity index 100% rename from devtools-panel/js/services/appCss.js rename to app/devtools-panel/js/services/appCss.js diff --git a/devtools-panel/js/services/appDeps.js b/app/devtools-panel/js/services/appDeps.js similarity index 100% rename from devtools-panel/js/services/appDeps.js rename to app/devtools-panel/js/services/appDeps.js diff --git a/devtools-panel/js/services/appHighlight.js b/app/devtools-panel/js/services/appHighlight.js similarity index 100% rename from devtools-panel/js/services/appHighlight.js rename to app/devtools-panel/js/services/appHighlight.js diff --git a/devtools-panel/js/services/appInfo.js b/app/devtools-panel/js/services/appInfo.js similarity index 100% rename from devtools-panel/js/services/appInfo.js rename to app/devtools-panel/js/services/appInfo.js diff --git a/devtools-panel/js/services/appModel.js b/app/devtools-panel/js/services/appModel.js similarity index 100% rename from devtools-panel/js/services/appModel.js rename to app/devtools-panel/js/services/appModel.js diff --git a/devtools-panel/js/services/appPerf.js b/app/devtools-panel/js/services/appPerf.js similarity index 100% rename from devtools-panel/js/services/appPerf.js rename to app/devtools-panel/js/services/appPerf.js diff --git a/devtools-panel/js/services/appWatch.js b/app/devtools-panel/js/services/appWatch.js similarity index 100% rename from devtools-panel/js/services/appWatch.js rename to app/devtools-panel/js/services/appWatch.js diff --git a/devtools-panel/js/services/chromeExtension.js b/app/devtools-panel/js/services/chromeExtension.js similarity index 100% rename from devtools-panel/js/services/chromeExtension.js rename to app/devtools-panel/js/services/chromeExtension.js diff --git a/devtools-panel/js/services/filesystem.js b/app/devtools-panel/js/services/filesystem.js similarity index 100% rename from devtools-panel/js/services/filesystem.js rename to app/devtools-panel/js/services/filesystem.js diff --git a/devtools-panel/panel.html b/app/devtools-panel/panel.html similarity index 100% rename from devtools-panel/panel.html rename to app/devtools-panel/panel.html index 76f5c46..1fb459f 100644 --- a/devtools-panel/panel.html +++ b/app/devtools-panel/panel.html @@ -16,8 +16,8 @@ - + diff --git a/devtools-panel/panes/deps.html b/app/devtools-panel/panes/deps.html similarity index 100% rename from devtools-panel/panes/deps.html rename to app/devtools-panel/panes/deps.html diff --git a/devtools-panel/panes/help.html b/app/devtools-panel/panes/help.html similarity index 100% rename from devtools-panel/panes/help.html rename to app/devtools-panel/panes/help.html diff --git a/devtools-panel/panes/model.html b/app/devtools-panel/panes/model.html similarity index 100% rename from devtools-panel/panes/model.html rename to app/devtools-panel/panes/model.html diff --git a/devtools-panel/panes/options.html b/app/devtools-panel/panes/options.html similarity index 100% rename from devtools-panel/panes/options.html rename to app/devtools-panel/panes/options.html diff --git a/devtools-panel/panes/perf.html b/app/devtools-panel/panes/perf.html similarity index 100% rename from devtools-panel/panes/perf.html rename to app/devtools-panel/panes/perf.html diff --git a/manifest.json b/app/manifest.json similarity index 78% rename from manifest.json rename to app/manifest.json index 80b1094..4fa0cf5 100644 --- a/manifest.json +++ b/app/manifest.json @@ -1,11 +1,11 @@ { "name": "AngularJS Batarang", - "version": "0.4.3", + "version": "0.5.0", "description": "Extends the Developer Tools, adding tools for debugging and profiling AngularJS applications.", "background": { - "page": "background.html" + "page": "background/background.html" }, - "devtools_page": "devtoolsBackground.html", + "devtools_page": "background/devtoolsBackground.html", "manifest_version": 2, "permissions": [ "tabs", diff --git a/devtoolsBackground.html b/devtoolsBackground.html deleted file mode 100644 index 4d9e1b8..0000000 --- a/devtoolsBackground.html +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/karma-inject.conf.js b/karma-inject.conf.js index 922a98a..25bd1ec 100644 --- a/karma-inject.conf.js +++ b/karma-inject.conf.js @@ -9,9 +9,9 @@ module.exports = function (config) { files: [ 'test/inject/mock/*.js', - 'content-scripts/inject.build.js', - 'bower_components/angular/angular.js', - 'bower_components/angular-mocks/angular-mocks.js', + 'app/content-scripts/inject.build.js', + 'app/bower_components/angular/angular.js', + 'app/bower_components/angular-mocks/angular-mocks.js', 'test/inject/*.js' ], diff --git a/package.json b/package.json index 2755652..b07ec1a 100644 --- a/package.json +++ b/package.json @@ -2,19 +2,34 @@ "name": "angularjs-batarang", "devDependencies": { "grunt": "~0.4.1", - "grunt-contrib-jshint": "~0.1.1", "grunt-conventional-changelog": "~0.1.2", "grunt-karma": "~0.4.3", + "grunt-bower-install": "~1.0.0", + "grunt-chrome-manifest": "~0.2.0", + "grunt-contrib-clean": "~0.5.0", + "grunt-contrib-compress": "~0.5.3", + "grunt-contrib-concat": "~0.3.0", + "grunt-contrib-connect": "~0.5.0", + "grunt-contrib-copy": "~0.4.1", + "grunt-contrib-cssmin": "~0.7.0", + "grunt-contrib-htmlmin": "~0.1.3", + "grunt-contrib-imagemin": "~0.5.0", + "grunt-contrib-jshint": "~0.7.0", + "grunt-contrib-uglify": "~0.2.0", + "grunt-contrib-watch": "~0.5.2", + "grunt-usemin": "~0.1.10", + "grunt-mocha": "~0.4.0", + "grunt-svgmin": "~0.2.0", + "grunt-concurrent": "~0.4.0", "grunt-release": "https://github.com/btford/grunt-release/archive/feat-tag-name.tar.gz", - "marked": "~0.2.8", "grunt-zip": "~0.7.0", + "marked": "~0.2.8", "semver": "~1.1.4", "rewire": "~2.0.0", "karma-phantomjs-launcher": "^0.1.3", - "karma-coverage": "^0.2.1", - "karma": "^0.12.3", - "karma-jasmine": "^0.1.5", - "karma-chrome-launcher": "^0.1.3" + "load-grunt-tasks": "~0.2.0", + "time-grunt": "~0.2.0", + "jshint-stylish": "~0.1.3" }, "scripts": { "test": "echo 'write them'" diff --git a/scripts/inline.js b/scripts/inline.js index 28ae1cf..d6fdc2c 100644 --- a/scripts/inline.js +++ b/scripts/inline.js @@ -10,20 +10,20 @@ var fs = require('fs'); var r = new RegExp("( *)(.*?)require\\('(.+?)'\\)", 'g'); module.exports = function () { - var debug = fs.readFileSync(__dirname + '/../content-scripts/inject.js', 'utf8'); + var debug = fs.readFileSync(__dirname + '/../app/content-scripts/inject.js', 'utf8'); var out = debug.replace(r, function (match, whitespace, before, file) { return whitespace + '// exported from ' + file + '\n' + whitespace + before + ex(whitespace, file); }); - fs.writeFileSync(__dirname + '/../content-scripts/inject.build.js', out); + fs.writeFileSync(__dirname + '/../app/content-scripts/inject.build.js', out); }; // takes the contents of a file, wraps it in a closure // and returns the result function ex (whitespace, file) { - var contents = fs.readFileSync(__dirname + '/../content-scripts/' + file, 'utf8'); + var contents = fs.readFileSync(__dirname + '/../app/content-scripts/' + file, 'utf8'); contents = contents.replace('module.exports = ', 'return '); contents = ['(function () {']. concat(contents.split('\n').