Skip to content
This repository was archived by the owner on Feb 9, 2020. It is now read-only.

Commit f1f31ad

Browse files
committed
v0.8.1
1 parent 0dd8b9c commit f1f31ad

File tree

3 files changed

+29
-11
lines changed

3 files changed

+29
-11
lines changed

dist/hint.js

Lines changed: 27 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1511,8 +1511,14 @@ var nameToControllerMap = {};
15111511
* log a message if the controller is instantiated on the window
15121512
*/
15131513
angular.module('ngHintControllers', []).
1514-
config(['$provide', function ($provide) {
1514+
config(['$provide', '$controllerProvider', function ($provide, $controllerProvider) {
15151515
$provide.decorator('$controller', ['$delegate', controllerDecorator]);
1516+
1517+
var originalRegister = $controllerProvider.register;
1518+
$controllerProvider.register = function(name, constructor) {
1519+
stringOrObjectRegister(name);
1520+
originalRegister.apply($controllerProvider, arguments);
1521+
}
15161522
}]);
15171523

15181524
function controllerDecorator($delegate) {
@@ -1521,7 +1527,10 @@ function controllerDecorator($delegate) {
15211527
var match = ctrl.match(CNTRL_REG);
15221528
var ctrlName = (match && match[1]) || ctrl;
15231529

1524-
sendMessageForControllerName(ctrlName);
1530+
if (!nameToControllerMap[ctrlName]) {
1531+
sendMessageForControllerName(ctrlName);
1532+
}
1533+
15251534
if (!nameToControllerMap[ctrlName] && typeof window[ctrlName] === 'function') {
15261535
sendMessageForGlobalController(ctrlName);
15271536
}
@@ -1537,6 +1546,14 @@ function controllerDecorator($delegate) {
15371546
*/
15381547
var originalModule = angular.module;
15391548

1549+
function stringOrObjectRegister(controllerName) {
1550+
if ((controllerName !== null) && (typeof controllerName === 'object')) {
1551+
Object.keys(controllerName).forEach(processController);
1552+
} else {
1553+
processController(controllerName);
1554+
}
1555+
}
1556+
15401557
function processController(ctrlName) {
15411558
nameToControllerMap[ctrlName] = true;
15421559
sendMessageForControllerName(ctrlName);
@@ -1594,11 +1611,7 @@ angular.module = function() {
15941611
originalController = module.controller;
15951612

15961613
module.controller = function(controllerName, controllerConstructor) {
1597-
if ((controllerName !== null) && (typeof controllerName === 'object')) {
1598-
Object.keys(controllerName).forEach(processController);
1599-
} else {
1600-
processController(controllerName);
1601-
}
1614+
stringOrObjectRegister(controllerName);
16021615
return originalController.apply(this, arguments);
16031616
};
16041617

@@ -1715,10 +1728,15 @@ angular.module = function(name, requiresOriginal) {
17151728

17161729
module.requiresOriginal = requiresOriginal;
17171730
modules[name] = module;
1718-
hasNameSpace(name);
17191731
var modToCheck = getModule(name, true);
1732+
//check arguments to determine if called as setter or getter
1733+
var modIsSetter = arguments.length > 1;
1734+
1735+
if (modIsSetter) {
1736+
hasNameSpace(name);
1737+
}
17201738

1721-
if(modToCheck && modToCheck.requiresOriginal !== module.requiresOriginal) {
1739+
if(modToCheck && modToCheck.requiresOriginal !== module.requiresOriginal && modIsSetter) {
17221740
if(!modData.createdMulti[name]) {
17231741
modData.createdMulti[name] = [getModule(name,true)];
17241742
}

manifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "AngularJS Batarang",
3-
"version": "0.8.0",
3+
"version": "0.8.1",
44
"description": "Extends the Developer Tools, adding tools for debugging and profiling AngularJS applications.",
55
"devtools_page": "devtoolsBackground.html",
66
"manifest_version": 2,

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "angularjs-batarang",
3-
"version": "0.8.0",
3+
"version": "0.8.1",
44
"description": "chrome extension for inspecting angular apps",
55
"main": "hint.js",
66
"devDependencies": {

0 commit comments

Comments
 (0)