Skip to content

Commit 1bad6d9

Browse files
Portugal, MarceloPortugal, Marcelo
Portugal, Marcelo
authored and
Portugal, Marcelo
committed
gh-pages v4.1.1
1 parent f728c92 commit 1bad6d9

File tree

308 files changed

+34288
-883
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

308 files changed

+34288
-883
lines changed

‎customizer/index.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,10 @@
5353
</a>
5454
<ul class="dropdown-menu" role="menu">
5555
<li>
56-
<a href="/docs/#/api">Docs</a>
56+
<a href="/docs/#!/api">Docs</a>
5757
</li>
5858
<li>
59-
<a href="/docs/#/tutorial">Tutorial</a>
59+
<a href="/docs/#!/tutorial">Tutorial</a>
6060
</li>
6161
</ul>
6262
</li>

‎docs/grunt-scripts/marked.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -875,7 +875,7 @@ Renderer.prototype.link = function(href, title, text) {
875875
} catch (e) {
876876
return '';
877877
}
878-
if (prot.indexOf('javascript:') === 0 || prot.indexOf('vbscript:') === 0 || prot.indexOf('data:') === 0) {
878+
if (prot.indexOf('javascript:') === 0 || prot.indexOf('vbscript:') === 0) {
879879
return '';
880880
}
881881
}

‎docs/index.html‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,16 @@
1919
// before the base attribute is added, causing 404 and terribly slow loading of the docs app.
2020
(function() {
2121
var indexFile = (location.pathname.match(/\/(index[^\.]*\.html)/) || ['', ''])[1],
22-
origin, baseUrl, rUrl = /(#!\/|api|tutorial|index[^\.]*\.html).*$/,
22+
origin, baseUrl, rUrl = /(\/?#!\/.*|\/(api|tutorial)\/?(\?.*)*|\/index[^\.]*\.html.*)$/,
2323
headEl = document.getElementsByTagName('head')[0],
2424
sync = true;
2525

2626
if (location.href.slice(0, 7) == 'file://') {
27-
baseUrl = location.href.replace(rUrl, indexFile);
27+
baseUrl = location.href.replace(rUrl, '/' + indexFile);
2828
} else {
2929
origin = location.origin || (window.location.protocol + "//" + window.location.hostname +
3030
(window.location.port ? ':' + window.location.port: ''));
31-
baseUrl = origin + location.href.substr(origin.length).replace(rUrl, indexFile);
31+
baseUrl = origin + location.href.substr(origin.length).replace(rUrl, '/' + indexFile);
3232
}
3333

3434
addTag('base', {href: baseUrl});
@@ -107,7 +107,6 @@
107107
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
108108
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
109109
})(window,document,'script','//www.google-analytics.com/analytics.js','ga');
110-
111110
ga('create', 'UA-46391685-1', 'auto');
112111
ga('send', 'pageview');
113112

@@ -252,9 +251,10 @@
252251
<li class="nav-header section" ng-show="module.services.length">
253252
<a class="guide">service</a>
254253
</li>
255-
<li ng-repeat="service in module.services track by service.instance.url" ng-class="navClass(service.instance, service.provider)" class="api-list-item expand">
254+
255+
<li ng-repeat="service in module.services track by (service.instance.url || service.provider.url)" ng-class="navClass(service.instance, service.provider)" class="api-list-item expand">
256256
<a ng-show="service.provider" class="pull-right" href="{{service.provider.url}}" tabindex="0"><i class="icon-cog" aria-hidden="true"></i><span class="sr-only">{{service.name}} Options</span></a>
257-
<a href="{{service.instance.url}}" tabindex="0">{{service.name}}</a>
257+
<a href="{{service.instance ? service.instance.url : service.provider.url}}" tabindex="0">{{service.name}}</a>
258258
</li>
259259

260260
<li class="nav-header section" ng-show="module.types.length">

‎docs/js/angular-bootstrap-prettify.js‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -191,8 +191,8 @@ directive.ngEvalJavascript = ['getEmbeddedTemplate', function(getEmbeddedTemplat
191191
}];
192192

193193

194-
directive.ngEmbedApp = ['$templateCache', '$browser', '$rootScope', '$location', '$sniffer', '$animate', '$exceptionHandler',
195-
function($templateCache, $browser, docsRootScope, $location, $sniffer, $animate, $exceptionHandler) {
194+
directive.ngEmbedApp = ['$templateCache', '$browser', '$rootScope', '$location', '$sniffer', '$exceptionHandler',
195+
function($templateCache, $browser, docsRootScope, $location, $sniffer, $exceptionHandler) {
196196
return {
197197
terminal: true,
198198
link: function(scope, element, attrs) {
@@ -205,7 +205,6 @@ directive.ngEmbedApp = ['$templateCache', '$browser', '$rootScope', '$location',
205205
$provide.value('$anchorScroll', angular.noop);
206206
$provide.value('$browser', $browser);
207207
$provide.value('$sniffer', $sniffer);
208-
$provide.value('$animate', $animate);
209208
$provide.provider('$location', function() {
210209
this.$get = ['$rootScope', function($rootScope) {
211210
docsRootScope.$on('$locationChangeSuccess', function(event, oldUrl, newUrl) {
@@ -254,8 +253,12 @@ directive.ngEmbedApp = ['$templateCache', '$browser', '$rootScope', '$location',
254253
});
255254

256255
element.bind('$destroy', function() {
257-
deregisterEmbedRootScope();
258-
embedRootScope.$destroy();
256+
if (deregisterEmbedRootScope) {
257+
deregisterEmbedRootScope();
258+
}
259+
if (embedRootScope) {
260+
embedRootScope.$destroy();
261+
}
259262
});
260263

261264
element.data('$injector', null);

‎docs/js/docs.js‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@ docsApp.serviceFactory.sections = function serviceFactory() {
252252
} else {
253253
page.partialUrl = 'partials/' + url.replace(':', '.') + '.html';
254254
}
255-
page.url = (NG_DOCS.html5Mode ? '' : '#/') + url;
255+
page.url = (NG_DOCS.html5Mode ? '' : '#!/') + url;
256256
if (!sections[page.section]) { sections[page.section] = []; }
257257
sections[page.section].push(page);
258258
});
@@ -359,7 +359,7 @@ docsApp.controller.DocsController = function($scope, $location, $window, $timeou
359359

360360
$scope.sections = {};
361361
angular.forEach(NG_DOCS.sections, function(section, url) {
362-
$scope.sections[(NG_DOCS.html5Mode ? '' : '#/') + url] = section;
362+
$scope.sections[(NG_DOCS.html5Mode ? '' : '#!/') + url] = section;
363363
});
364364
$scope.$watch(function docsPathWatch() {return $location.path(); }, function docsPathWatchAction(path) {
365365

@@ -383,7 +383,7 @@ docsApp.controller.DocsController = function($scope, $location, $window, $timeou
383383
var parts = path.split('/'),
384384
sectionId = parts[1],
385385
partialId = parts[2],
386-
page, sectionName = $scope.sections[(NG_DOCS.html5Mode ? '' : '#/') + sectionId];
386+
page, sectionName = $scope.sections[(NG_DOCS.html5Mode ? '' : '#!/') + sectionId];
387387

388388
if (!sectionName) { return; }
389389

@@ -399,7 +399,7 @@ docsApp.controller.DocsController = function($scope, $location, $window, $timeou
399399

400400
// Update breadcrumbs
401401
var breadcrumb = $scope.breadcrumb = [],
402-
match, sectionPath = (NG_DOCS.html5Mode ? '' : '#/') + sectionId;
402+
match, sectionPath = (NG_DOCS.html5Mode ? '' : '#!/') + sectionId;
403403

404404
if (partialId) {
405405
breadcrumb.push({ name: sectionName, url: sectionPath });
@@ -546,7 +546,7 @@ docsApp.controller.DocsController = function($scope, $location, $window, $timeou
546546
if (!module) {
547547
module = cache[name] = {
548548
name: name,
549-
url: (NG_DOCS.html5Mode ? '' : '#/') + section + '/' + name,
549+
url: (NG_DOCS.html5Mode ? '' : '#!/') + section + '/' + name,
550550
globals: [],
551551
controllers: [],
552552
directives: [],

‎docs/partials/api/exporterMenuAllData.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<a href="https://github.com/angular-ui/ui-grid/edit/master/src/features/exporter/js/exporter.js" class="improve-docs"><i class="icon-edit"> </i>Improve this doc</a><a href="https://github.com/angular-ui/ui-grid/blob/a205c13/src/features/exporter/js/exporter.js#L405" class="view-source"><i class="icon-eye-open"> </i>View source</a><h1><code ng:non-bindable="">exporterMenuAllData</code>
1+
<a href="https://github.com/angular-ui/ui-grid/edit/master/src/features/exporter/js/exporter.js" class="improve-docs"><i class="icon-edit"> </i>Improve this doc</a><a href="https://github.com/angular-ui/ui-grid/blob/089006f/src/features/exporter/js/exporter.js#L405" class="view-source"><i class="icon-eye-open"> </i>View source</a><h1><code ng:non-bindable="">exporterMenuAllData</code>
22
<div><span class="hint"></span>
33
</div>
44
</h1>

‎docs/partials/api/exporterMenuSelectedData.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<a href="https://github.com/angular-ui/ui-grid/edit/master/src/features/exporter/js/exporter.js" class="improve-docs"><i class="icon-edit"> </i>Improve this doc</a><a href="https://github.com/angular-ui/ui-grid/blob/a205c13/src/features/exporter/js/exporter.js#L421" class="view-source"><i class="icon-eye-open"> </i>View source</a><h1><code ng:non-bindable="">exporterMenuSelectedData</code>
1+
<a href="https://github.com/angular-ui/ui-grid/edit/master/src/features/exporter/js/exporter.js" class="improve-docs"><i class="icon-edit"> </i>Improve this doc</a><a href="https://github.com/angular-ui/ui-grid/blob/089006f/src/features/exporter/js/exporter.js#L421" class="view-source"><i class="icon-eye-open"> </i>View source</a><h1><code ng:non-bindable="">exporterMenuSelectedData</code>
22
<div><span class="hint"></span>
33
</div>
44
</h1>

‎docs/partials/api/exporterMenuVisibleData.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<a href="https://github.com/angular-ui/ui-grid/edit/master/src/features/exporter/js/exporter.js" class="improve-docs"><i class="icon-edit"> </i>Improve this doc</a><a href="https://github.com/angular-ui/ui-grid/blob/a205c13/src/features/exporter/js/exporter.js#L413" class="view-source"><i class="icon-eye-open"> </i>View source</a><h1><code ng:non-bindable="">exporterMenuVisibleData</code>
1+
<a href="https://github.com/angular-ui/ui-grid/edit/master/src/features/exporter/js/exporter.js" class="improve-docs"><i class="icon-edit"> </i>Improve this doc</a><a href="https://github.com/angular-ui/ui-grid/blob/089006f/src/features/exporter/js/exporter.js#L413" class="view-source"><i class="icon-eye-open"> </i>View source</a><h1><code ng:non-bindable="">exporterMenuVisibleData</code>
22
<div><span class="hint"></span>
33
</div>
44
</h1>

‎docs/partials/api/index.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
<h1><code ng:non-bindable=""></code>
1+
<a href="https://github.com/angular-ui/ui-grid/edit/master/misc/api/index.ngdoc" class="improve-docs"><i class="icon-edit"> </i>Improve this doc</a><a href="https://github.com/angular-ui/ui-grid/blob/089006f/misc/api/index.ngdoc#L2" class="view-source"><i class="icon-eye-open"> </i>View source</a><h1><code ng:non-bindable=""></code>
22
<div><span class="hint"></span>
33
</div>
44
</h1>
55
<div><div class="api-page api-index-page"><p>The ui-grid API consists of the core ui.grid documentation, plus documentation for each of the features that
66
you can choose to add to the grid.</p>
77
<p>In general the features will extend the core ui-grid configuration. So, for example, if you wanted to configure
88
the core ui-grid, you might choose to set some options and columns on your grid (the documentation for these is
9-
found in <a href="#/api/ui.grid.class:GridOptions">gridOptions</a> and <a href="#/api/ui.grid.class:GridOptions.columnDef">columnDef</a>.</p>
9+
found in <a href="#!/api/ui.grid.class:GridOptions">gridOptions</a> and <a href="#!/api/ui.grid.class:GridOptions.columnDef">columnDef</a>.</p>
1010
<pre class="prettyprint linenums">
1111
$scope.gridOptions = {
1212
enableSorting: true,
@@ -18,7 +18,7 @@ <h1><code ng:non-bindable=""></code>
1818
};
1919
</pre>
2020
<p>If you had enabled the edit feature, then the columnDefs and gridOptions would have additional settings, the documentation
21-
for these is at <a href="#/api/ui.grid.edit.api:ColumnDef">columnDef</a> and <a href="#/api/ui.grid.edit.api:GridOptions">gridOptions</a>, but you
21+
for these is at <a href="#!/api/ui.grid.edit.api:ColumnDef">columnDef</a> and <a href="#!/api/ui.grid.edit.api:GridOptions">gridOptions</a>, but you
2222
still set these through the same mechanism:</p>
2323
<pre class="prettyprint linenums">
2424
$scope.gridOptions = {

‎docs/partials/api/ui.grid.autoResize.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<a href="https://github.com/angular-ui/ui-grid/edit/master/src/features/auto-resize-grid/js/auto-resize.js" class="improve-docs"><i class="icon-edit"> </i>Improve this doc</a><a href="https://github.com/angular-ui/ui-grid/blob/a205c13/src/features/auto-resize-grid/js/auto-resize.js#L15" class="view-source"><i class="icon-eye-open"> </i>View source</a><h1><code ng:non-bindable=""></code>
1+
<a href="https://github.com/angular-ui/ui-grid/edit/master/src/features/auto-resize-grid/js/auto-resize.js" class="improve-docs"><i class="icon-edit"> </i>Improve this doc</a><a href="https://github.com/angular-ui/ui-grid/blob/089006f/src/features/auto-resize-grid/js/auto-resize.js#L15" class="view-source"><i class="icon-eye-open"> </i>View source</a><h1><code ng:non-bindable=""></code>
22
<div><span class="hint"></span>
33
</div>
44
</h1>

0 commit comments

Comments
 (0)