Merge branch 'mohsen1-git-attrs' into develop_2.0

This commit is contained in:
Tony Tam
2015-03-17 16:16:37 -07:00
14 changed files with 319 additions and 316 deletions

3
.gitattributes vendored Normal file
View File

@@ -0,0 +1,3 @@
* text eol=lf
dist/**/* binary

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.6 KiB

After

Width:  |  Height:  |  Size: 5.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 645 B

After

Width:  |  Height:  |  Size: 644 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 770 B

After

Width:  |  Height:  |  Size: 769 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 824 B

After

Width:  |  Height:  |  Size: 823 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 980 B

After

Width:  |  Height:  |  Size: 979 B

View File

@@ -90,7 +90,6 @@ window.Docs = {
// e.g. /docs/#!/words/get_search // e.g. /docs/#!/words/get_search
var fragments = $.param.fragment().split('/'); var fragments = $.param.fragment().split('/');
fragments.shift(); // get rid of the bang fragments.shift(); // get rid of the bang
fragments = _.map(fragments, decodeURIComponent); // decode encoded paths
switch (fragments.length) { switch (fragments.length) {
case 1: case 1:
@@ -98,22 +97,22 @@ window.Docs = {
var dom_id = 'resource_' + fragments[0]; var dom_id = 'resource_' + fragments[0];
Docs.expandEndpointListForResource(fragments[0]); Docs.expandEndpointListForResource(fragments[0]);
$('[id="' + dom_id + '"]').slideto({highlight: false}); $("#"+dom_id).slideto({highlight: false});
break; break;
case 2: case 2:
// Refer to the endpoint DOM element, e.g. #words_get_search // Refer to the endpoint DOM element, e.g. #words_get_search
// Expand Resource // Expand Resource
Docs.expandEndpointListForResource(fragments[0]); Docs.expandEndpointListForResource(fragments[0]);
// $("#"+dom_id).slideto({highlight: false}); $("#"+dom_id).slideto({highlight: false});
// Expand operation // Expand operation
var li_dom_id = fragments.join('_'); var li_dom_id = fragments.join('_');
var li_content_dom_id = li_dom_id + "_content"; var li_content_dom_id = li_dom_id + "_content";
Docs.expandOperation($('[id="' + li_content_dom_id + '"]')); Docs.expandOperation($('#'+li_content_dom_id));
$('[id="' + li_dom_id + '"]').slideto({highlight: false}); $('#'+li_dom_id).slideto({highlight: false});
break; break;
} }
@@ -196,3 +195,4 @@ window.Docs = {
elem.slideUp(); elem.slideUp();
} }
}; };
>>>>>>> afe232747b3d2f972d358c43688185d8fe3e7406