Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
nikitaeverywhere committed May 14, 2015
2 parents bfb8e40 + 5d03fcd commit 911f450
Show file tree
Hide file tree
Showing 11 changed files with 276 additions and 87 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ An UML Class explorer for InterSystems Caché.

## Screenshots

![Demo](https://cloud.githubusercontent.com/assets/4989256/7622499/9cb98048-f9d8-11e4-9c27-4257e53ec70d.png)
![Demo](https://cloud.githubusercontent.com/assets/4989256/7642972/f2c3e33c-fa9d-11e4-90b4-d35c809c9e60.png)

## Installation

Expand Down
6 changes: 3 additions & 3 deletions cache/projectTemplate.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<Class name="UMLExplorer.ClassView">
<Description>
Class contains methods that return structured classes/packages data.</Description>
<TimeChanged>63686,4398.893381</TimeChanged>
<TimeChanged>63686,85630.818189</TimeChanged>
<TimeCreated>63653,67019.989197</TimeCreated>

<Method name="getClassTree">
Expand Down Expand Up @@ -115,8 +115,8 @@ Return structured data about class.</Description>
for i=1:1:count {
set oPar = ##class(%ZEN.proxyObject).%New()
set p = classDefinition.Parameters.GetAt(i)
set oPar.type = p.Type
do oParameters.%DispatchSetProperty(p.Name, oPar)
do oPar.%DispatchSetProperty("type", p.Type)
}
do ..collectInheritance(oData, classDefinition, package)
Expand Down Expand Up @@ -302,7 +302,7 @@ Returns structured package data</Description>
</Class>


<Project name="UMLExplorer" LastModified="2015-05-08 19:38:35.423206">
<Project name="UMLExplorer" LastModified="2015-05-14 01:35:59.888696">
<Items>
<ProjectItem name="UMLExplorer.ClassView" type="CLS"></ProjectItem>
<ProjectItem name="UMLExplorer.Router" type="CLS"></ProjectItem>
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "CacheUMLExplorer",
"version": "0.8.0",
"version": "0.9.2",
"description": "An UML Class explorer for InterSystems Caché",
"directories": {
"test": "test"
Expand Down
12 changes: 12 additions & 0 deletions web/css/extras.css
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,18 @@
box-shadow: 0 0 5px 2px #ffcc1b;
}

.icon.help:after {
content: "?";
position: absolute;
color: white;
display: block;
font-size: 21px;
font-weight: 900;
height: 100%;
width: 100%;
text-align: center;
}

.icon.plus:before {
content: "";
background-color: #fff;
Expand Down
4 changes: 4 additions & 0 deletions web/css/interface.css
Original file line number Diff line number Diff line change
Expand Up @@ -32,27 +32,31 @@ html, body {
padding: .5em;
font-weight: 600;
font-size: 18pt;
z-index: 1;
}

.ui-rightBottomToolBar {
position: absolute;
bottom: 0;
right: 0;
padding: .5em;
z-index: 1;
}

.ui-leftBottomToolBar {
position: absolute;
bottom: 0;
left: 0;
padding: .5em;
z-index: 1;
}

.ui-topRightToolBar {
position: absolute;
top: 0;
right: 0;
padding: .5em;
z-index: 1;
}

#className {
Expand Down
1 change: 1 addition & 0 deletions web/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
</div>
<div class="ui-topRightToolBar">
<div id="button.showInfo" class="icon info"></div>
<div id="button.showHelp" class="icon help"></div>
</div>
<div class="ui-leftBottomToolBar">
<div id="button.downloadSVG" class="icon download"></div>
Expand Down
5 changes: 5 additions & 0 deletions web/js/CacheUMLExplorer.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ var CacheUMLExplorer = function (treeViewContainer, classViewContainer) {
zoomInButton: id("button.zoomIn"),
zoomOutButton: id("button.zoomOut"),
zoomNormalButton: id("button.zoomNormal"),
helpButton: id("button.showHelp"),
infoButton: id("button.showInfo"),
methodCodeView: id("methodCodeView"),
closeMethodCodeView: id("closeMethodCodeView"),
Expand Down Expand Up @@ -53,7 +54,11 @@ CacheUMLExplorer.prototype.init = function () {
this.classView.loadClass(hash.substr(7));
} else if (hash.indexOf("package:") === 1) {
this.classView.loadPackage(hash.substr(9));
} else {
this.classView.renderInfoGraphic();
}
} else {
this.classView.renderInfoGraphic();
}

this.elements.infoButton.addEventListener("click", function () {
Expand Down
Loading

0 comments on commit 911f450

Please sign in to comment.