moved stuff around

This commit is contained in:
Borys Levytskyi
2015-04-02 22:06:05 +03:00
parent cfa948f6b0
commit 0b3e0ed4fb
8 changed files with 178 additions and 139 deletions

245
.idea/workspace.xml generated
View File

@@ -37,14 +37,14 @@
<entry file="file://$PROJECT_DIR$/js/expressionInputCtrl.js">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="476">
<caret line="1" column="36" selection-start-line="1" selection-start-column="36" selection-end-line="1" selection-end-column="36" />
<caret line="6" column="28" selection-start-line="6" selection-start-column="28" selection-end-line="6" selection-end-column="28" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="formatter.js" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/js/components/formatter.js">
<entry file="file://$PROJECT_DIR$/js/formatter.js">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="578">
<caret line="4" column="0" selection-start-line="4" selection-start-column="0" selection-end-line="4" selection-end-column="0" />
@@ -53,10 +53,10 @@
</provider>
</entry>
</file>
<file leaf-file-name="expression.js" pinned="false" current="true" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/js/components/expression.js">
<file leaf-file-name="expression.js" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/js/expression.js">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.07383279" vertical-offset="0" max-vertical-offset="921">
<state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="510">
<caret line="4" column="33" selection-start-line="4" selection-start-column="33" selection-end-line="4" selection-end-column="33" />
<folding />
</state>
@@ -66,8 +66,18 @@
<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="-22.0" vertical-offset="227" max-vertical-offset="1224">
<caret line="47" column="30" selection-start-line="47" selection-start-column="30" selection-end-line="47" selection-end-column="30" />
<state vertical-scroll-proportion="-5.230769" vertical-offset="0" max-vertical-offset="1241">
<caret line="8" column="62" selection-start-line="8" selection-start-column="54" selection-end-line="8" selection-end-column="62" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="commandr.js" pinned="false" current="true" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/js/components/commandr.js">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.44299674" vertical-offset="0" max-vertical-offset="921">
<caret line="24" column="4" selection-start-line="24" selection-start-column="4" selection-end-line="24" selection-end-column="4" />
<folding />
</state>
</provider>
@@ -76,13 +86,23 @@
<file leaf-file-name="bindr.js" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/js/components/bindr.js">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1547">
<state vertical-scroll-proportion="0.0" vertical-offset="626" max-vertical-offset="1547">
<caret line="71" column="0" selection-start-line="71" selection-start-column="0" selection-end-line="71" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="calc.js" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/js/calc.js">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="493">
<caret line="14" column="13" selection-start-line="14" selection-start-column="13" selection-end-line="14" selection-end-column="13" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="html.js" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/js/components/html.js">
<provider selected="true" editor-type-id="text-editor">
@@ -93,18 +113,8 @@
</provider>
</entry>
</file>
<file leaf-file-name="calc.js" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/js/components/calc.js">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="493">
<caret line="14" column="13" selection-start-line="14" selection-start-column="13" selection-end-line="14" selection-end-column="13" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="core.js" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/js/components/core.js">
<file leaf-file-name="should.js" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/js/components/should.js">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="578">
<caret line="26" column="0" selection-start-line="26" selection-start-column="0" selection-end-line="26" selection-end-column="0" />
@@ -113,16 +123,6 @@
</provider>
</entry>
</file>
<file leaf-file-name="app.js" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/js/app.js">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="218" max-vertical-offset="1139">
<caret line="41" column="6" selection-start-line="41" selection-start-column="6" selection-end-line="41" selection-end-column="6" />
<folding />
</state>
</provider>
</entry>
</file>
</leaf>
</component>
<component name="FindManager">
@@ -152,12 +152,14 @@
<option value="$PROJECT_DIR$/js/components/html.js" />
<option value="$PROJECT_DIR$/css/styles.css" />
<option value="$PROJECT_DIR$/js/components/inputView.js" />
<option value="$PROJECT_DIR$/js/app.js" />
<option value="$PROJECT_DIR$/js/components/expressionInputCtrl.js" />
<option value="$PROJECT_DIR$/js/expressionInputCtrl.js" />
<option value="$PROJECT_DIR$/js/components/bindr.js" />
<option value="$PROJECT_DIR$/index.html" />
<option value="$PROJECT_DIR$/js/components/expression.js" />
<option value="$PROJECT_DIR$/js/components/command.js" />
<option value="$PROJECT_DIR$/js/expressionInputCtrl.js" />
<option value="$PROJECT_DIR$/index.html" />
<option value="$PROJECT_DIR$/js/app.js" />
<option value="$PROJECT_DIR$/js/components/commandr.js" />
</list>
</option>
</component>
@@ -167,6 +169,25 @@
<option name="width" value="1936" />
<option name="height" value="1056" />
</component>
<component name="ProjectInspectionProfilesVisibleTreeState">
<entry key="Project Default">
<profile-state>
<expanded-state>
<State>
<id />
</State>
<State>
<id>Spelling</id>
</State>
</expanded-state>
<selected-state>
<State>
<id>SpellCheckingInspection</id>
</State>
</selected-state>
</profile-state>
</entry>
</component>
<component name="ProjectLevelVcsManager" settingsEditedManually="false">
<OptionsSetting value="true" id="Add" />
<OptionsSetting value="true" id="Remove" />
@@ -193,6 +214,7 @@
<sortByType />
</navigator>
<panes>
<pane id="Scope" />
<pane id="ProjectPane">
<subPane>
<PATH>
@@ -259,7 +281,6 @@
</PATH>
</subPane>
</pane>
<pane id="Scope" />
</panes>
</component>
<component name="PropertiesComponent">
@@ -279,6 +300,14 @@
</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" />
@@ -289,12 +318,14 @@
<option name="showConsoleOnStdOut" value="false" />
<method />
</configuration>
<configuration default="true" type="DartUnitRunConfigurationType" factoryName="DartUnit">
<option name="VMOptions" />
<option name="arguments" />
<configuration default="true" type="CucumberJavaScriptRunConfigurationType" factoryName="Cucumber.js">
<option name="cucumberJsArguments" />
<option name="executablePath" />
<option name="filePath" />
<option name="scope" value="ALL" />
<option name="testName" />
<method />
</configuration>
<configuration default="true" type="JavaScriptTestRunnerKarma" factoryName="Karma" config-file="">
<envs />
<method />
</configuration>
<configuration default="true" type="JSTestDriver:ConfigurationType" factoryName="JsTestDriver">
@@ -304,16 +335,6 @@
<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>
@@ -350,11 +371,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="true" 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="true" 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">
@@ -379,14 +400,6 @@
</breakpoint-manager>
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/js/app.js">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="561" max-vertical-offset="731">
<caret line="33" column="0" selection-start-line="33" selection-start-column="0" selection-end-line="33" 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.0" vertical-offset="165" max-vertical-offset="816">
@@ -403,7 +416,7 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/js/components/core.js">
<entry file="file://$PROJECT_DIR$/js/components/should.js">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="442" max-vertical-offset="578">
<caret line="26" column="0" selection-start-line="26" selection-start-column="0" selection-end-line="26" selection-end-column="0" />
@@ -411,7 +424,7 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/js/components/calc.js">
<entry file="file://$PROJECT_DIR$/js/calc.js">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="238" max-vertical-offset="493">
<caret line="14" column="13" selection-start-line="14" selection-start-column="13" selection-end-line="14" selection-end-column="13" />
@@ -427,7 +440,7 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/js/components/formatter.js">
<entry file="file://$PROJECT_DIR$/js/formatter.js">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="578">
<caret line="4" column="0" selection-start-line="4" selection-start-column="0" selection-end-line="4" selection-end-column="0" />
@@ -435,7 +448,7 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/js/components/expression.js">
<entry file="file://$PROJECT_DIR$/js/expression.js">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="136" max-vertical-offset="425">
<caret line="8" column="0" selection-start-line="8" selection-start-column="0" selection-end-line="8" selection-end-column="0" />
@@ -451,7 +464,7 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/js/components/core.js">
<entry file="file://$PROJECT_DIR$/js/components/should.js">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="442" max-vertical-offset="561">
<caret line="26" column="0" selection-start-line="26" selection-start-column="0" selection-end-line="26" selection-end-column="0" />
@@ -459,7 +472,7 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/js/components/calc.js">
<entry file="file://$PROJECT_DIR$/js/calc.js">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="187" max-vertical-offset="493">
<caret line="11" column="25" selection-start-line="11" selection-start-column="25" selection-end-line="11" selection-end-column="25" />
@@ -475,7 +488,7 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/js/components/formatter.js">
<entry file="file://$PROJECT_DIR$/js/formatter.js">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="306" max-vertical-offset="493">
<caret line="18" column="6" selection-start-line="18" selection-start-column="6" selection-end-line="18" selection-end-column="6" />
@@ -483,7 +496,7 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/js/components/expression.js">
<entry file="file://$PROJECT_DIR$/js/expression.js">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="204" max-vertical-offset="425">
<caret line="12" column="20" selection-start-line="12" selection-start-column="20" selection-end-line="12" selection-end-column="20" />
@@ -499,7 +512,7 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/js/components/core.js">
<entry file="file://$PROJECT_DIR$/js/components/should.js">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="136" max-vertical-offset="646">
<caret line="8" column="21" selection-start-line="8" selection-start-column="21" selection-end-line="8" selection-end-column="21" />
@@ -523,7 +536,7 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/js/components/formatter.js">
<entry file="file://$PROJECT_DIR$/js/formatter.js">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="272" max-vertical-offset="510">
<caret line="16" column="0" selection-start-line="3" selection-start-column="0" selection-end-line="16" selection-end-column="0" />
@@ -531,7 +544,7 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/js/components/expression.js">
<entry file="file://$PROJECT_DIR$/js/expression.js">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="99" max-vertical-offset="1020">
<caret line="19" column="21" selection-start-line="19" selection-start-column="21" selection-end-line="19" selection-end-column="21" />
@@ -547,7 +560,7 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/js/components/core.js">
<entry file="file://$PROJECT_DIR$/js/components/should.js">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="34" max-vertical-offset="187">
<caret line="2" column="54" selection-start-line="2" selection-start-column="54" selection-end-line="2" selection-end-column="54" />
@@ -563,7 +576,7 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/js/components/formatter.js">
<entry file="file://$PROJECT_DIR$/js/formatter.js">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="323" max-vertical-offset="510">
<caret line="19" column="15" selection-start-line="19" selection-start-column="15" selection-end-line="19" selection-end-column="15" />
@@ -571,7 +584,7 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/js/components/expression.js">
<entry file="file://$PROJECT_DIR$/js/expression.js">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1020">
<caret line="19" column="21" selection-start-line="19" selection-start-column="21" selection-end-line="19" selection-end-column="21" />
@@ -587,7 +600,7 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/js/components/core.js">
<entry file="file://$PROJECT_DIR$/js/components/should.js">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="34" max-vertical-offset="187">
<caret line="2" column="54" selection-start-line="2" selection-start-column="54" selection-end-line="2" selection-end-column="54" />
@@ -603,7 +616,7 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/js/components/formatter.js">
<entry file="file://$PROJECT_DIR$/js/formatter.js">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="323" max-vertical-offset="510">
<caret line="19" column="15" selection-start-line="19" selection-start-column="15" selection-end-line="19" selection-end-column="15" />
@@ -611,7 +624,7 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/js/components/expression.js">
<entry file="file://$PROJECT_DIR$/js/expression.js">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="99" max-vertical-offset="1020">
<caret line="19" column="21" selection-start-line="19" selection-start-column="21" selection-end-line="19" selection-end-column="21" />
@@ -627,7 +640,7 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/js/components/core.js">
<entry file="file://$PROJECT_DIR$/js/components/should.js">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="17" max-vertical-offset="187">
<caret line="1" column="24" selection-start-line="1" selection-start-column="24" selection-end-line="1" selection-end-column="24" />
@@ -643,7 +656,7 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/js/components/formatter.js">
<entry file="file://$PROJECT_DIR$/js/formatter.js">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="272" max-vertical-offset="510">
<caret line="16" column="7" selection-start-line="16" selection-start-column="7" selection-end-line="16" selection-end-column="7" />
@@ -651,7 +664,7 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/js/components/expression.js">
<entry file="file://$PROJECT_DIR$/js/expression.js">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="391" max-vertical-offset="1020">
<caret line="23" column="0" selection-start-line="23" selection-start-column="0" selection-end-line="23" selection-end-column="0" />
@@ -675,7 +688,7 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/js/components/formatter.js">
<entry file="file://$PROJECT_DIR$/js/formatter.js">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="306" max-vertical-offset="510">
<caret line="18" column="0" selection-start-line="18" selection-start-column="0" selection-end-line="18" selection-end-column="0" />
@@ -683,7 +696,7 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/js/components/expression.js">
<entry file="file://$PROJECT_DIR$/js/expression.js">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="119">
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
@@ -707,10 +720,34 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/js/components/calc.js">
<entry file="file://$PROJECT_DIR$/js/app.js">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="493">
<caret line="14" column="13" selection-start-line="14" selection-start-column="13" selection-end-line="14" selection-end-column="13" />
<state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1003">
<caret line="0" column="27" selection-start-line="0" selection-start-column="27" selection-end-line="0" selection-end-column="27" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/js/components/should.js">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="578">
<caret line="26" column="0" selection-start-line="26" selection-start-column="0" selection-end-line="26" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/js/components/html.js">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="867">
<caret line="13" column="12" selection-start-line="13" selection-start-column="12" selection-end-line="13" selection-end-column="12" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/js/expressionInputCtrl.js">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="476">
<caret line="6" column="28" selection-start-line="6" selection-start-column="28" selection-end-line="6" selection-end-column="28" />
<folding />
</state>
</provider>
@@ -731,31 +768,23 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/js/components/core.js">
<entry file="file://$PROJECT_DIR$/js/calc.js">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="578">
<caret line="26" column="0" selection-start-line="26" selection-start-column="0" selection-end-line="26" selection-end-column="0" />
<state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="493">
<caret line="14" column="13" selection-start-line="14" selection-start-column="13" selection-end-line="14" selection-end-column="13" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/js/components/html.js">
<entry file="file://$PROJECT_DIR$/js/expression.js">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="867">
<caret line="13" column="12" selection-start-line="13" selection-start-column="12" selection-end-line="13" selection-end-column="12" />
<state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="510">
<caret line="4" column="33" selection-start-line="4" selection-start-column="33" selection-end-line="4" selection-end-column="33" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/js/app.js">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="218" max-vertical-offset="1139">
<caret line="41" column="6" selection-start-line="41" selection-start-column="6" selection-end-line="41" selection-end-column="6" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/js/components/formatter.js">
<entry file="file://$PROJECT_DIR$/js/formatter.js">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="578">
<caret line="4" column="0" selection-start-line="4" selection-start-column="0" selection-end-line="4" selection-end-column="0" />
@@ -763,26 +792,18 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/js/expressionInputCtrl.js">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="476">
<caret line="1" column="36" selection-start-line="1" selection-start-column="36" selection-end-line="1" selection-end-column="36" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/index.html">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-22.0" vertical-offset="227" max-vertical-offset="1224">
<caret line="47" column="30" selection-start-line="47" selection-start-column="30" selection-end-line="47" selection-end-column="30" />
<state vertical-scroll-proportion="-5.230769" vertical-offset="0" max-vertical-offset="1241">
<caret line="8" column="62" selection-start-line="8" selection-start-column="54" selection-end-line="8" selection-end-column="62" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/js/components/expression.js">
<entry file="file://$PROJECT_DIR$/js/components/commandr.js">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.07383279" vertical-offset="0" max-vertical-offset="921">
<caret line="4" column="33" selection-start-line="4" selection-start-column="33" selection-end-line="4" selection-end-column="33" />
<state vertical-scroll-proportion="0.44299674" vertical-offset="0" max-vertical-offset="921">
<caret line="24" column="4" selection-start-line="24" selection-start-column="4" selection-end-line="24" selection-end-column="4" />
<folding />
</state>
</provider>

View File

@@ -6,12 +6,13 @@
<title></title>
<script type="text/javascript" src="js/components/bindr.js"></script>
<script type="text/javascript" src="js/components/core.js"></script>
<script type="text/javascript" src="js/components/commandr.js"></script>
<script type="text/javascript" src="js/components/should.js"></script>
<script type="text/javascript" src="js/app.js"></script>
<script type="text/javascript" src="js/components/html.js"></script>
<script type="text/javascript" src="js/components/calc.js"></script>
<script type="text/javascript" src="js/components/expression.js"></script>
<script type="text/javascript" src="js/components/formatter.js"></script>
<script type="text/javascript" src="js/calc.js"></script>
<script type="text/javascript" src="js/expression.js"></script>
<script type="text/javascript" src="js/formatter.js"></script>
<script type="text/javascript" src="js/views.js"></script>
<script type="text/javascript" src="js/expressionInputCtrl.js"></script>
@@ -41,7 +42,7 @@
expressionInputCtrl.bind(document.getElementById('in'), model);
app.command('calculateExpression').subscribe(function() {
app.command('calculateExpression', function() {
var expr = expression.parse(model.expression);
if(expr == null) {

View File

@@ -1,11 +1,11 @@
(function (should, bindr) {
(function (should, commandr) {
var app = {};
app.views = {};
var servicesContainer = {};
var controllersContainer = {};
var events = {};
var commands = {};
function resolveOrInject(name, inst, container, entityName) {
var resolved;
@@ -33,30 +33,22 @@
return resolveOrInject(name, inst, controllersContainer, "controller");
};
app.command = function(name) {
var evt = events[name];
if(evt == null) {
evt = events[name] = new Command(name);
app.command = function(name, handler) {
var cmd = commands[name];
if(cmd == null) {
cmd = commands[name] = new commandr.Command(name);
}
return evt;
if(typeof handler == "function") {
cmd.subscribe(handler);
}
return cmd;
};
window.app = app;
function Command(name) {
this.name = name;
this.handlers = [];
}
Command.prototype.fire = function (arg) {
for(var i=0; i<1; i++) {
this.handlers[i](arg);
}
};
Command.prototype.subscribe = function (handler) {
this.handlers.push(handler);
// TODO: unsubcribe
}
})(window.should);
})(window.should, window.commandr);

25
js/components/commandr.js Normal file
View File

@@ -0,0 +1,25 @@
(function(){
var commandr = {
};
function Command(name) {
this.name = name;
this.handlers = [];
}
Command.prototype.fire = function (arg) {
for(var i=0; i<1; i++) {
this.handlers[i](arg);
}
};
Command.prototype.subscribe = function (handler) {
this.handlers.push(handler);
// TODO: unsubcribe
};
commandr.Command = Command;
window.commandr = commandr;
})();