mirrors/BitwiseCmd
1
0
Fork 0
mirror of https://github.com/BorysLevytskyi/BitwiseCmd.git synced 2025-12-10 15:02:07 +01:00
Code Issues Projects Releases Wiki Activity

fixed bugs in dispatching of commands

Browse Source
This commit is contained in:
Borys Levytskyi
2015-04-03 03:51:00 +03:00
parent 86349c9c30
commit a7d2077305
5 changed files with 69 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

140
.idea/workspace.xml generated
View File

@@ -26,18 +26,18 @@
<file leaf-file-name="views.js" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/views.js">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1190">
<caret line="4" column="11" selection-start-line="4" selection-start-column="11" selection-end-line="4" selection-end-column="11" />
<state vertical-scroll-proportion="0.0" vertical-offset="534" max-vertical-offset="1190">
<caret line="42" column="15" selection-start-line="42" selection-start-column="15" selection-end-line="42" selection-end-column="15" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="controllers.js" pinned="false" current="false" current-in-tab="false">
<file leaf-file-name="controllers.js" pinned="false" current="true" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/app/controllers.js">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="75" max-vertical-offset="816">
<caret line="37" column="7" selection-start-line="37" selection-start-column="7" selection-end-line="37" selection-end-column="7" />
<state vertical-scroll-proportion="0.3469388" vertical-offset="0" max-vertical-offset="816">
<caret line="12" column="17" selection-start-line="12" selection-start-column="17" selection-end-line="12" selection-end-column="17" />
<folding />
</state>
</provider>
@@ -53,11 +53,11 @@
</provider>
</entry>
</file>
<file leaf-file-name="index.html" pinned="false" current="true" current-in-tab="true">
<file leaf-file-name="index.html" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/index.html">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.93950176" vertical-offset="305" max-vertical-offset="2023">
<caret line="49" column="13" selection-start-line="49" selection-start-column="13" selection-end-line="49" selection-end-column="13" />
<state vertical-scroll-proportion="-6.576923" vertical-offset="713" max-vertical-offset="2023">
<caret line="52" column="51" selection-start-line="52" selection-start-column="51" selection-end-line="52" selection-end-column="51" />
<folding />
</state>
</provider>
@@ -76,12 +76,9 @@
<file leaf-file-name="app.js" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/app.js">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="92" max-vertical-offset="816">
<state vertical-scroll-proportion="0.0" vertical-offset="466" max-vertical-offset="1054">
<caret line="43" column="0" selection-start-line="43" selection-start-column="0" selection-end-line="43" selection-end-column="0" />
<folding>
<element signature="e#539#805#0" expanded="false" />
<element signature="e#841#885#0" expanded="false" />
</folding>
<folding />
</state>
</provider>
</entry>
@@ -110,7 +107,7 @@
<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="289">
<caret line="2" column="0" selection-start-line="2" selection-start-column="0" selection-end-line="2" selection-end-column="0" />
<caret line="6" column="6" selection-start-line="6" selection-start-column="6" selection-end-line="6" selection-end-column="6" />
<folding />
</state>
</provider>
@@ -119,8 +116,8 @@
<file leaf-file-name="container.js" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/components/container.js">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="126" max-vertical-offset="799">
<caret line="22" column="36" selection-start-line="22" selection-start-column="36" selection-end-line="22" selection-end-column="36" />
<state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="816">
<caret line="5" column="0" selection-start-line="5" selection-start-column="0" selection-end-line="5" selection-end-column="0" />
<folding />
</state>
</provider>
@@ -162,7 +159,6 @@
<option value="$PROJECT_DIR$/js/components/commandr.js" />
<option value="$PROJECT_DIR$/js/bitwise/expression.js" />
<option value="$PROJECT_DIR$/css/styles.css" />
<option value="$PROJECT_DIR$/app/views.js" />
<option value="$PROJECT_DIR$/app/inputCtrl.js" />
<option value="$PROJECT_DIR$/components/html.js" />
<option value="$PROJECT_DIR$/app/views/views.js" />
@@ -173,11 +169,12 @@
<option value="$PROJECT_DIR$/app/bootstrap.js" />
<option value="$PROJECT_DIR$/components/controlr.js" />
<option value="$PROJECT_DIR$/index.html" />
<option value="$PROJECT_DIR$/components/container.js" />
<option value="$PROJECT_DIR$/components/bindr.js" />
<option value="$PROJECT_DIR$/app/app.js" />
<option value="$PROJECT_DIR$/app/controllers.js" />
<option value="$PROJECT_DIR$/app/services.js" />
<option value="$PROJECT_DIR$/app/views.js" />
<option value="$PROJECT_DIR$/components/container.js" />
<option value="$PROJECT_DIR$/app/controllers.js" />
</list>
</option>
</component>
@@ -315,14 +312,6 @@
</key>
</component>
<component name="RunManager">
<configuration default="true" type="DartUnitRunConfigurationType" factoryName="DartUnit">
<option name="VMOptions" />
<option name="arguments" />
<option name="filePath" />
<option name="scope" value="ALL" />
<option name="testName" />
<method />
</configuration>
<configuration default="true" type="DartCommandLineRunConfigurationType" factoryName="Dart Command Line Application">
<option name="VMOptions" />
<option name="arguments" />
@@ -333,14 +322,12 @@
<option name="showConsoleOnStdOut" value="false" />
<method />
</configuration>
<configuration default="true" type="CucumberJavaScriptRunConfigurationType" factoryName="Cucumber.js">
<option name="cucumberJsArguments" />
<option name="executablePath" />
<configuration default="true" type="DartUnitRunConfigurationType" factoryName="DartUnit">
<option name="VMOptions" />
<option name="arguments" />
<option name="filePath" />
<method />
</configuration>
<configuration default="true" type="JavaScriptTestRunnerKarma" factoryName="Karma" config-file="">
<envs />
<option name="scope" value="ALL" />
<option name="testName" />
<method />
</configuration>
<configuration default="true" type="JSTestDriver:ConfigurationType" factoryName="JsTestDriver">
@@ -350,6 +337,16 @@
<setting name="preferredDebugBrowser" value="Chrome" />
<method />
</configuration>
<configuration default="true" type="JavaScriptTestRunnerKarma" factoryName="Karma" config-file="">
<envs />
<method />
</configuration>
<configuration default="true" type="CucumberJavaScriptRunConfigurationType" factoryName="Cucumber.js">
<option name="cucumberJsArguments" />
<option name="executablePath" />
<option name="filePath" />
<method />
</configuration>
<configuration default="true" type="JavascriptDebugType" factoryName="JavaScript Debug">
<method />
</configuration>
@@ -386,11 +383,11 @@
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
<window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3284055" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3284055" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
</layout>
</component>
<component name="Vcs.Log.UiProperties">
@@ -426,10 +423,7 @@
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="153" max-vertical-offset="510">
<caret line="9" column="30" selection-start-line="9" selection-start-column="30" selection-end-line="9" selection-end-column="30" />
<folding>
<element signature="e#539#805#0" expanded="false" />
<element signature="e#841#885#0" expanded="false" />
</folding>
<folding />
</state>
</provider>
</entry>
@@ -474,10 +468,7 @@
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="153" max-vertical-offset="510">
<caret line="9" column="30" selection-start-line="9" selection-start-column="30" selection-end-line="9" selection-end-column="30" />
<folding>
<element signature="e#539#805#0" expanded="false" />
<element signature="e#841#885#0" expanded="false" />
</folding>
<folding />
</state>
</provider>
</entry>
@@ -523,10 +514,7 @@
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="510">
<caret line="0" column="20" selection-start-line="0" selection-start-column="20" selection-end-line="0" selection-end-column="20" />
<folding>
<element signature="e#539#805#0" expanded="false" />
<element signature="e#841#885#0" expanded="false" />
</folding>
<folding />
</state>
</provider>
</entry>
@@ -731,7 +719,6 @@
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="612">
<caret line="12" column="28" selection-start-line="12" selection-start-column="28" selection-end-line="12" selection-end-column="28" />
<folding />
</state>
</provider>
</entry>
@@ -751,14 +738,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/components/container.js">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="126" max-vertical-offset="799">
<caret line="22" column="36" selection-start-line="22" selection-start-column="36" selection-end-line="22" selection-end-column="36" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/components/bindr.js">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="1241" max-vertical-offset="2278">
@@ -767,21 +746,26 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/app.js">
<entry file="file://$PROJECT_DIR$/app/views.js">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="92" max-vertical-offset="816">
<caret line="43" column="0" selection-start-line="43" selection-start-column="0" selection-end-line="43" selection-end-column="0" />
<folding>
<element signature="e#539#805#0" expanded="false" />
<element signature="e#841#885#0" expanded="false" />
</folding>
<state vertical-scroll-proportion="0.0" vertical-offset="534" max-vertical-offset="1190">
<caret line="42" column="15" selection-start-line="42" selection-start-column="15" selection-end-line="42" selection-end-column="15" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/views.js">
<entry file="file://$PROJECT_DIR$/index.html">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1190">
<caret line="4" column="11" selection-start-line="4" selection-start-column="11" selection-end-line="4" selection-end-column="11" />
<state vertical-scroll-proportion="-6.576923" vertical-offset="713" max-vertical-offset="2023">
<caret line="52" column="51" selection-start-line="52" selection-start-column="51" selection-end-line="52" selection-end-column="51" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/components/container.js">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="816">
<caret line="5" column="0" selection-start-line="5" selection-start-column="0" selection-end-line="5" selection-end-column="0" />
<folding />
</state>
</provider>
@@ -794,26 +778,26 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/app.js">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="92" max-vertical-offset="816">
<caret line="43" column="0" selection-start-line="43" selection-start-column="0" selection-end-line="43" selection-end-column="0" />
<folding />
</state>
</provider>
</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="289">
<caret line="2" column="0" selection-start-line="2" selection-start-column="0" selection-end-line="2" selection-end-column="0" />
<caret line="6" column="6" selection-start-line="6" selection-start-column="6" selection-end-line="6" selection-end-column="6" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/controllers.js">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="75" max-vertical-offset="816">
<caret line="37" column="7" selection-start-line="37" selection-start-column="7" selection-end-line="37" selection-end-column="7" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/index.html">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.93950176" vertical-offset="305" max-vertical-offset="2023">
<caret line="49" column="13" selection-start-line="49" selection-start-column="13" selection-end-line="49" selection-end-column="13" />
<state vertical-scroll-proportion="0.3469388" vertical-offset="0" max-vertical-offset="816">
<caret line="12" column="17" selection-start-line="12" selection-start-column="17" selection-end-line="12" selection-end-column="17" />
<folding />
</state>
</provider>

4
app/controllers.js
View File

@@ -3,14 +3,14 @@
app.controller('expressionInputCtrl', {
$dispatcher:null,
attachView: function (viewElement) {
var d = this.$dispatcher;
viewElement.addEventListener('keyup', function (args) {
if (args.keyCode != 13) {
return;
}
// Enter
this.$dispatcher.dispatch(args.srcElement.value);
d.dispatch(args.srcElement.value);
args.srcElement.value = '';
});
}

4
app/views.js
View File

@@ -8,7 +8,7 @@
this.expression = expression;
}
ExpressionView.prototype.getViewElement = function () {
ExpressionView.prototype.render = function () {
var expr = this.expression,
hb = app.service('html').builder(),
result = expr.result(),
@@ -48,7 +48,7 @@
this.commands = commands;
}
HelpView.prototype.getViewElement = function() {
HelpView.prototype.render = function() {
var hb = app.service('html').builder();
var commands = this.commands;
hb.element('ul', { class: 'result' }, function() {

1
components/container.js
View File

@@ -25,6 +25,7 @@
reg.resolved = inst;
}
console.log(name + ' resolved', reg.resolved);
return reg.resolved;
};

4
index.html
View File

@@ -50,7 +50,7 @@
}
var expressionView = new window.app.views.ExpressionView(expr);
resultView.insert(expressionView.getViewElement());
resultView.insert(expressionView.render());
cmdArgs.commandHandled = true;
});
@@ -68,7 +68,7 @@
var helpView = new app.views.HelpView(commands);
resultView.insert(helpView.getViewElement());
resultView.insert(helpView.render());
cmdArgs.commandHandled = true;
});