Skip to content

Commit 71ec30f

Browse files
author
agustin
committed
Bump parser version to 1.1.5. Fix angular minification.
1 parent 9cd9ca0 commit 71ec30f

File tree

12 files changed

+46587
-328399
lines changed

12 files changed

+46587
-328399
lines changed

‎.gitignore‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
node_modules
22
.tmp
3+
.DS_Store
34
.sass-cache
45
.idea
5-
.idea/
6+
*.iml
67
selenium
78
vendor/bower_components
89
bower_components

‎bower.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
"jszip": "~2.0.0",
2121
"marked": "~0.3.1",
2222
"raml-client-generator": "~0.0.7",
23-
"raml-1-parser": "https://github.com/raml-org/raml-js-parser-2/releases/download/1.0.0/raml-1-parser.zip",
23+
"raml-1-parser": "https://github.com/raml-org/raml-js-parser-2/releases/download/1.1.5/raml-1-parser.zip",
2424
"resolve-url": "~0.2.1",
2525
"slug": "~0.8.0",
2626
"velocity": "~1.1.0",

‎dist/scripts/api-console-vendor.js‎

Lines changed: 46546 additions & 328349 deletions
Large diffs are not rendered by default.

‎dist/scripts/api-console.js‎

Lines changed: 19 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -745,7 +745,7 @@
745745
hidePropertyDetails: '=',
746746
showExamples: '='
747747
},
748-
controller: function ($scope, $rootScope) {
748+
controller: ['$scope', '$rootScope', function ($scope, $rootScope) {
749749
if (!Array.isArray($scope.list)) {
750750
$scope.listArray = Object.keys($scope.list).map(function (key) {
751751
return $scope.list[key];
@@ -906,15 +906,15 @@
906906
$scope.unique = function (arr) {
907907
return arr.filter (function (v, i, a) { return a.indexOf (v) === i; });
908908
};
909-
},
909+
}],
910910
compile: function (element) {
911911
return RecursionHelper.compile(element);
912912
}
913913
};
914914
};
915915

916916
angular.module('RAML.Directives')
917-
.directive('properties', RAML.Directives.properties);
917+
.directive('properties', ['RecursionHelper', RAML.Directives.properties]);
918918
})();
919919

920920
(function () {
@@ -1157,12 +1157,9 @@
11571157
}
11581158
};
11591159
})
1160-
.controller('RamlConsoleController', function RamlConsoleController(
1161-
$attrs,
1162-
$scope,
1163-
$rootScope,
1164-
$timeout,
1165-
$window
1160+
.controller('RamlConsoleController',
1161+
['$attrs', '$scope', '$rootScope', '$timeout', '$window', function RamlConsoleController(
1162+
$attrs, $scope, $rootScope, $timeout, $window
11661163
) {
11671164
$scope.allowUnsafeMarkdown = $attrs.hasOwnProperty('allowUnsafeMarkdown');
11681165
$scope.collapseAll = collapseAll;
@@ -1415,7 +1412,7 @@
14151412
}
14161413
}
14171414
}
1418-
})
1415+
}])
14191416
;
14201417
})();
14211418

@@ -1531,7 +1528,7 @@
15311528
};
15321529

15331530
angular.module('RAML.Directives')
1534-
.directive('ramlField', RAML.Directives.ramlField);
1531+
.directive('ramlField', ['RecursionHelper', RAML.Directives.ramlField]);
15351532
})();
15361533

15371534
(function () {
@@ -1546,10 +1543,8 @@
15461543
controller: 'RamlInitializerController'
15471544
};
15481545
})
1549-
.controller('RamlInitializerController', function RamlInitializerController(
1550-
$scope,
1551-
$window,
1552-
ramlParser
1546+
.controller('RamlInitializerController', ['$scope', '$window', 'ramlParser', function RamlInitializerController(
1547+
$scope, $window, ramlParser
15531548
) {
15541549
$scope.vm = {
15551550
codeMirror: {
@@ -1631,7 +1626,7 @@
16311626
});
16321627
};
16331628
}
1634-
})
1629+
}])
16351630
;
16361631
})();
16371632

@@ -1792,7 +1787,7 @@
17921787
scope: {
17931788
types: '='
17941789
},
1795-
controller: function ($scope) {
1790+
controller: ['$scope', function ($scope) {
17961791
$scope.convertTypes = function () {
17971792
var types = {};
17981793
$scope.types.forEach(function (type) {
@@ -1804,7 +1799,7 @@
18041799
$scope.$watch('types', function () {
18051800
$scope.convertTypes();
18061801
});
1807-
}
1802+
}]
18081803
};
18091804
};
18101805

@@ -2549,11 +2544,11 @@
25492544
scope: {
25502545
type: '='
25512546
},
2552-
controller: function ($scope) {
2547+
controller: ['$scope', function ($scope) {
25532548
$scope.properties = {
25542549
body: [$scope.type]
25552550
};
2556-
}
2551+
}]
25572552
};
25582553
};
25592554

@@ -2574,7 +2569,7 @@
25742569
hideTypeLinks: '=',
25752570
items: '='
25762571
},
2577-
controller: function ($scope, $rootScope, $timeout) {
2572+
controller: ['$scope', '$rootScope', '$timeout', function ($scope, $rootScope, $timeout) {
25782573
$scope.typeInfo = RAML.Inspector.Types.getTypeInfo($scope.typeName, $scope.items);
25792574

25802575
$scope.closePopover = function () {
@@ -2616,7 +2611,7 @@
26162611

26172612
$event.stopPropagation();
26182613
};
2619-
}
2614+
}]
26202615
};
26212616
};
26222617

@@ -2703,7 +2698,7 @@
27032698
'use strict';
27042699

27052700
angular.module('raml', [])
2706-
.factory('ramlParser', function ramlParser(
2701+
.factory('ramlParser', ['$http', '$q', '$window', function ramlParser(
27072702
$http,
27082703
$q,
27092704
$window
@@ -2800,7 +2795,7 @@
28002795
throw new Error('ramlParser: loadPath: loadApi: content: ' + path + ': no such path');
28012796
}
28022797
}
2803-
})
2798+
}])
28042799
;
28052800
})();
28062801

‎src/app/directives/properties.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
hidePropertyDetails: '=',
1717
showExamples: '='
1818
},
19-
controller: function ($scope, $rootScope) {
19+
controller: ['$scope', '$rootScope', function ($scope, $rootScope) {
2020
if (!Array.isArray($scope.list)) {
2121
$scope.listArray = Object.keys($scope.list).map(function (key) {
2222
return $scope.list[key];
@@ -177,13 +177,13 @@
177177
$scope.unique = function (arr) {
178178
return arr.filter (function (v, i, a) { return a.indexOf (v) === i; });
179179
};
180-
},
180+
}],
181181
compile: function (element) {
182182
return RecursionHelper.compile(element);
183183
}
184184
};
185185
};
186186

187187
angular.module('RAML.Directives')
188-
.directive('properties', RAML.Directives.properties);
188+
.directive('properties', ['RecursionHelper', RAML.Directives.properties]);
189189
})();

‎src/app/directives/raml-console.js‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,9 @@
1414
}
1515
};
1616
})
17-
.controller('RamlConsoleController', function RamlConsoleController(
18-
$attrs,
19-
$scope,
20-
$rootScope,
21-
$timeout,
22-
$window
17+
.controller('RamlConsoleController',
18+
['$attrs', '$scope', '$rootScope', '$timeout', '$window', function RamlConsoleController(
19+
$attrs, $scope, $rootScope, $timeout, $window
2320
) {
2421
$scope.allowUnsafeMarkdown = $attrs.hasOwnProperty('allowUnsafeMarkdown');
2522
$scope.collapseAll = collapseAll;
@@ -272,6 +269,6 @@
272269
}
273270
}
274271
}
275-
})
272+
}])
276273
;
277274
})();

‎src/app/directives/raml-field.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,5 +110,5 @@
110110
};
111111

112112
angular.module('RAML.Directives')
113-
.directive('ramlField', RAML.Directives.ramlField);
113+
.directive('ramlField', ['RecursionHelper', RAML.Directives.ramlField]);
114114
})();

‎src/app/directives/raml-initializer.js‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,8 @@
1010
controller: 'RamlInitializerController'
1111
};
1212
})
13-
.controller('RamlInitializerController', function RamlInitializerController(
14-
$scope,
15-
$window,
16-
ramlParser
13+
.controller('RamlInitializerController', ['$scope', '$window', 'ramlParser', function RamlInitializerController(
14+
$scope, $window, ramlParser
1715
) {
1816
$scope.vm = {
1917
codeMirror: {
@@ -95,6 +93,6 @@
9593
});
9694
};
9795
}
98-
})
96+
}])
9997
;
10098
})();

‎src/app/directives/root-types.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
scope: {
1010
types: '='
1111
},
12-
controller: function ($scope) {
12+
controller: ['$scope', function ($scope) {
1313
$scope.convertTypes = function () {
1414
var types = {};
1515
$scope.types.forEach(function (type) {
@@ -21,7 +21,7 @@
2121
$scope.$watch('types', function () {
2222
$scope.convertTypes();
2323
});
24-
}
24+
}]
2525
};
2626
};
2727

‎src/app/directives/type-properties.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@
99
scope: {
1010
type: '='
1111
},
12-
controller: function ($scope) {
12+
controller: ['$scope', function ($scope) {
1313
$scope.properties = {
1414
body: [$scope.type]
1515
};
16-
}
16+
}]
1717
};
1818
};
1919

0 commit comments

Comments
 (0)