Small changes

This commit is contained in:
Borys Levytskyi
2015-04-02 23:33:01 +03:00
parent a9264b11e3
commit c200a2d507
4 changed files with 27 additions and 39 deletions

58
.idea/workspace.xml generated
View File

@@ -23,11 +23,11 @@
</component> </component>
<component name="FileEditorManager"> <component name="FileEditorManager">
<leaf> <leaf>
<file leaf-file-name="views.js" pinned="false" current="true" current-in-tab="true"> <file leaf-file-name="views.js" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/views/views.js"> <entry file="file://$PROJECT_DIR$/app/views/views.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.76004344" vertical-offset="252" max-vertical-offset="1173"> <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1190">
<caret line="56" column="6" selection-start-line="56" selection-start-column="6" selection-end-line="56" selection-end-column="6" /> <caret line="61" column="0" selection-start-line="61" selection-start-column="0" selection-end-line="61" selection-end-column="0" />
<folding /> <folding />
</state> </state>
</provider> </provider>
@@ -43,11 +43,11 @@
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="index.html" pinned="false" current="false" current-in-tab="false"> <file leaf-file-name="index.html" pinned="false" current="true" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/index.html"> <entry file="file://$PROJECT_DIR$/index.html">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-22.0" vertical-offset="516" max-vertical-offset="1530"> <state vertical-scroll-proportion="0.5821229" vertical-offset="210" max-vertical-offset="1564">
<caret line="64" column="45" selection-start-line="64" selection-start-column="45" selection-end-line="64" selection-end-column="45" /> <caret line="43" column="21" selection-start-line="43" selection-start-column="21" selection-end-line="43" selection-end-column="21" />
<folding /> <folding />
</state> </state>
</provider> </provider>
@@ -66,8 +66,8 @@
<file leaf-file-name="dispatcher.js" pinned="false" current="false" current-in-tab="false"> <file leaf-file-name="dispatcher.js" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/dispatcher.js"> <entry file="file://$PROJECT_DIR$/app/dispatcher.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="476"> <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="459">
<caret line="14" column="0" selection-start-line="14" selection-start-column="0" selection-end-line="14" selection-end-column="0" /> <caret line="13" column="20" selection-start-line="13" selection-start-column="20" selection-end-line="13" selection-end-column="24" />
<folding /> <folding />
</state> </state>
</provider> </provider>
@@ -167,9 +167,9 @@
<option value="$PROJECT_DIR$/app/views.js" /> <option value="$PROJECT_DIR$/app/views.js" />
<option value="$PROJECT_DIR$/app/inputCtrl.js" /> <option value="$PROJECT_DIR$/app/inputCtrl.js" />
<option value="$PROJECT_DIR$/components/html.js" /> <option value="$PROJECT_DIR$/components/html.js" />
<option value="$PROJECT_DIR$/app/views/views.js" />
<option value="$PROJECT_DIR$/app/dispatcher.js" /> <option value="$PROJECT_DIR$/app/dispatcher.js" />
<option value="$PROJECT_DIR$/index.html" /> <option value="$PROJECT_DIR$/index.html" />
<option value="$PROJECT_DIR$/app/views/views.js" />
</list> </list>
</option> </option>
</component> </component>
@@ -256,20 +256,6 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT> </PATH_ELEMENT>
</PATH> </PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="BitwiseCalc" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="BitwiseCalc" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="components" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
<PATH> <PATH>
<PATH_ELEMENT> <PATH_ELEMENT>
<option name="myItemId" value="BitwiseCalc" /> <option name="myItemId" value="BitwiseCalc" />
@@ -782,14 +768,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/dispatcher.js">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="476">
<caret line="14" column="0" selection-start-line="14" selection-start-column="0" selection-end-line="14" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/components/html.js"> <entry file="file://$PROJECT_DIR$/components/html.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1105"> <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1105">
@@ -806,18 +784,26 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/index.html"> <entry file="file://$PROJECT_DIR$/app/dispatcher.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-22.0" vertical-offset="516" max-vertical-offset="1530"> <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="459">
<caret line="64" column="45" selection-start-line="64" selection-start-column="45" selection-end-line="64" selection-end-column="45" /> <caret line="13" column="20" selection-start-line="13" selection-start-column="20" selection-end-line="13" selection-end-column="24" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/views/views.js"> <entry file="file://$PROJECT_DIR$/app/views/views.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.76004344" vertical-offset="252" max-vertical-offset="1173"> <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1190">
<caret line="56" column="6" selection-start-line="56" selection-start-column="6" selection-end-line="56" selection-end-column="6" /> <caret line="61" column="0" selection-start-line="61" selection-start-column="0" selection-end-line="61" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/index.html">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.5821229" vertical-offset="210" max-vertical-offset="1564">
<caret line="43" column="21" selection-start-line="43" selection-start-column="21" selection-end-line="43" selection-end-column="21" />
<folding /> <folding />
</state> </state>
</provider> </provider>

View File

@@ -10,8 +10,7 @@
for(i=0; i<handlers.length; i++){ for(i=0; i<handlers.length; i++){
result = handlers[i](cmd); result = handlers[i](cmd);
if(result != null) if(result != null) {
{
this this
} }

View File

@@ -1,3 +1,4 @@
// Expression View
(function(app) { (function(app) {
var formatter = app.service('formatter'); var formatter = app.service('formatter');
@@ -41,6 +42,7 @@
})(window.app); })(window.app);
// Help View
(function(app){ (function(app){
function HelpView(commands) { function HelpView(commands) {
this.commands = commands; this.commands = commands;
@@ -56,7 +58,6 @@
return hb.toHtmlElement(); return hb.toHtmlElement();
}; };
app.views.HelpView = HelpView; app.views.HelpView = HelpView;
})(window.app); })(window.app);

View File

@@ -41,6 +41,7 @@
app.controller('expressionInputCtrl').bind(document.getElementById('in')); app.controller('expressionInputCtrl').bind(document.getElementById('in'));
// Expression
app.command('dispatchInput', function(cmdArgs) { app.command('dispatchInput', function(cmdArgs) {
var expr = expression.parse(cmdArgs.input); var expr = expression.parse(cmdArgs.input);
@@ -62,6 +63,7 @@
} }
var commands = [{ name: 'help', description: 'Displays help'}]; var commands = [{ name: 'help', description: 'Displays help'}];
var helpView = new app.views.HelpView(commands) var helpView = new app.views.HelpView(commands)
outputDiv.appendChild(helpView.getViewElement()); outputDiv.appendChild(helpView.getViewElement());