martin/Rinser
martin/Rinser
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Updating to Version 3

Browse Source
This commit is contained in:
Martin Donnelly 2016-03-15 14:36:04 +00:00
parent 1b88dd3c29
commit 0e747fa860
3 changed files with 93 additions and 109 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

197
.idea/workspace.xml
View File

@ -2,8 +2,9 @@
<project version="4"> <project version="4">
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="c2fd5632-2143-4c7e-8b0d-96d7692b700b" name="Default" comment=""> <list default="true" id="c2fd5632-2143-4c7e-8b0d-96d7692b700b" name="Default" comment="">
<change type="DELETED" beforePath="$PROJECT_DIR$/html/lifestyle.json" afterPath="" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/gulpfile.js" afterPath="$PROJECT_DIR$/gulpfile.js" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/html/js/app.v3.js" afterPath="$PROJECT_DIR$/html/js/app.v3.js" />
</list> </list>
<ignored path="rinser.iws" /> <ignored path="rinser.iws" />
<ignored path=".idea/workspace.xml" /> <ignored path=".idea/workspace.xml" />
@ -147,7 +148,7 @@
<entry file="file://$PROJECT_DIR$/gulpfile.js"> <entry file="file://$PROJECT_DIR$/gulpfile.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0"> <state vertical-scroll-proportion="0.0">
<caret line="39" column="34" selection-start-line="39" selection-start-column="34" selection-end-line="39" selection-end-column="34" /> <caret line="30" column="38" selection-start-line="30" selection-start-column="5" selection-end-line="30" selection-end-column="40" />
<folding /> <folding />
</state> </state>
</provider> </provider>
@ -156,29 +157,21 @@
<file leaf-file-name="app.js" pinned="false" current-in-tab="true"> <file leaf-file-name="app.js" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/dist/js/app.js"> <entry file="file://$PROJECT_DIR$/dist/js/app.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0"> <state vertical-scroll-proportion="0.6081772">
<caret line="0" column="20" selection-start-line="0" selection-start-column="20" selection-end-line="0" selection-end-column="20" /> <caret line="106" column="10" selection-start-line="106" selection-start-column="10" selection-end-line="106" selection-end-column="10" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="shell.js" pinned="false" current-in-tab="false"> <file leaf-file-name="app.v3.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/html/js/shell.js"> <entry file="file://$PROJECT_DIR$/html/js/app.v3.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0"> <state vertical-scroll-proportion="0.0">
<caret line="35" column="44" selection-start-line="35" selection-start-column="44" selection-end-line="35" selection-end-column="44" /> <caret line="56" column="11" selection-start-line="56" selection-start-column="11" selection-end-line="56" selection-end-column="11" />
<folding /> <folding>
</state> <element signature="e#0#43#0" expanded="false" />
</provider> </folding>
</entry>
</file>
<file leaf-file-name="index.html" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/dist/index.html">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="4.923077">
<caret line="0" column="39" selection-start-line="0" selection-start-column="39" selection-end-line="0" selection-end-column="39" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
@ -196,35 +189,13 @@
<file leaf-file-name=".jshintrc" pinned="false" current-in-tab="false"> <file leaf-file-name=".jshintrc" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/.jshintrc"> <entry file="file://$PROJECT_DIR$/.jshintrc">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-0.65384614"> <state vertical-scroll-proportion="-7.1923075">
<caret line="1" column="15" selection-start-line="1" selection-start-column="15" selection-end-line="1" selection-end-column="15" /> <caret line="11" column="16" selection-start-line="11" selection-start-column="16" selection-end-line="11" selection-end-column="16" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="pipes-server.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/pipes-server.js">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="28" column="53" selection-start-line="28" selection-start-column="53" selection-end-line="28" selection-end-column="53" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="app.v3.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/html/js/app.v3.js">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="147" column="5" selection-start-line="147" selection-start-column="5" selection-end-line="147" selection-end-column="5" />
<folding>
<element signature="e#0#43#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
</file>
</leaf> </leaf>
</split-second> </split-second>
</splitter> </splitter>
@ -271,18 +242,18 @@
<option value="$PROJECT_DIR$/gulp/build.js" /> <option value="$PROJECT_DIR$/gulp/build.js" />
<option value="$PROJECT_DIR$/package.json" /> <option value="$PROJECT_DIR$/package.json" />
<option value="$PROJECT_DIR$/.jshintrc" /> <option value="$PROJECT_DIR$/.jshintrc" />
<option value="$PROJECT_DIR$/html/js/app.v3.js" />
<option value="$PROJECT_DIR$/html/index.html" /> <option value="$PROJECT_DIR$/html/index.html" />
<option value="$PROJECT_DIR$/pipes-server.js" /> <option value="$PROJECT_DIR$/pipes-server.js" />
<option value="$PROJECT_DIR$/dist/index.html" /> <option value="$PROJECT_DIR$/dist/index.html" />
<option value="$PROJECT_DIR$/dist/js/app.js" />
<option value="$PROJECT_DIR$/html/js/shell.js" /> <option value="$PROJECT_DIR$/html/js/shell.js" />
<option value="$PROJECT_DIR$/paleo.js" /> <option value="$PROJECT_DIR$/paleo.js" />
<option value="$PROJECT_DIR$/tech.js" /> <option value="$PROJECT_DIR$/tech.js" />
<option value="$PROJECT_DIR$/news.js" /> <option value="$PROJECT_DIR$/news.js" />
<option value="$PROJECT_DIR$/lifestyle.js" /> <option value="$PROJECT_DIR$/lifestyle.js" />
<option value="$PROJECT_DIR$/gulpfile.js" />
<option value="$PROJECT_DIR$/dist/js/vendor.js" /> <option value="$PROJECT_DIR$/dist/js/vendor.js" />
<option value="$PROJECT_DIR$/gulpfile.js" />
<option value="$PROJECT_DIR$/html/js/app.v3.js" />
<option value="$PROJECT_DIR$/dist/js/app.js" />
</list> </list>
</option> </option>
</component> </component>
@ -346,6 +317,38 @@
<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="rinser" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="Rinser" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="html" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="rinser" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="Rinser" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="html" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="js" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
<PATH> <PATH>
<PATH_ELEMENT> <PATH_ELEMENT>
<option name="myItemId" value="rinser" /> <option name="myItemId" value="rinser" />
@ -413,14 +416,15 @@
</component> </component>
<component name="RecentsManager"> <component name="RecentsManager">
<key name="MoveFile.RECENT_KEYS"> <key name="MoveFile.RECENT_KEYS">
<recent name="C:\mddev\Rinser\dist" />
<recent name="C:\mddev\Rinser\html" /> <recent name="C:\mddev\Rinser\html" />
</key> </key>
<key name="CopyFile.RECENT_KEYS"> <key name="CopyFile.RECENT_KEYS">
<recent name="C:\mddev\Rinser\dist" />
<recent name="C:\mddev\Rinser\html" /> <recent name="C:\mddev\Rinser\html" />
<recent name="C:\mddev\Rinser\html\libs" /> <recent name="C:\mddev\Rinser\html\libs" />
<recent name="C:\mddev\Rinser\html\js" /> <recent name="C:\mddev\Rinser\html\js" />
<recent name="C:\mddev\Rinser\html\css" /> <recent name="C:\mddev\Rinser\html\css" />
<recent name="C:\mddev\Rinser" />
</key> </key>
</component> </component>
<component name="RunManager" selected="Gulp.js.Gulp"> <component name="RunManager" selected="Gulp.js.Gulp">
@ -661,7 +665,19 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1458048034591</updated> <updated>1458048034591</updated>
</task> </task>
<option name="localTasksCounter" value="25" /> <task id="LOCAL-00025" summary="Updating to Version 3">
<created>1458048637392</created>
<option name="number" value="00025" />
<option name="project" value="LOCAL" />
<updated>1458048637392</updated>
</task>
<task id="LOCAL-00026" summary="Updating to Version 3">
<created>1458048832162</created>
<option name="number" value="00026" />
<option name="project" value="LOCAL" />
<updated>1458048832162</updated>
</task>
<option name="localTasksCounter" value="27" />
<servers /> <servers />
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
@ -737,37 +753,6 @@
<watches-manager /> <watches-manager />
</component> </component>
<component name="editorHistoryManager"> <component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/output.txt">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="0" column="13" selection-start-line="0" selection-start-column="13" selection-end-line="0" selection-end-column="13" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/html/lifestyle.json">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/html/lifestyle.xml">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="888" column="15" selection-start-line="888" selection-start-column="15" selection-end-line="888" selection-end-column="15" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/html/lifestyle.html">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/bin/www"> <entry file="file://$PROJECT_DIR$/bin/www">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0"> <state vertical-scroll-proportion="0.0">
@ -1007,24 +992,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/.jshintrc">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-0.65384614">
<caret line="1" column="15" selection-start-line="1" selection-start-column="15" selection-end-line="1" selection-end-column="15" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/html/js/app.v3.js">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="147" column="5" selection-start-line="147" selection-start-column="5" selection-end-line="147" selection-end-column="5" />
<folding>
<element signature="e#0#43#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/dist/index.html"> <entry file="file://$PROJECT_DIR$/dist/index.html">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0"> <state vertical-scroll-proportion="0.0">
@ -1097,14 +1064,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/gulpfile.js">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="39" column="34" selection-start-line="39" selection-start-column="34" selection-end-line="39" selection-end-column="34" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/dist/js/vendor.js"> <entry file="file://$PROJECT_DIR$/dist/js/vendor.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0"> <state vertical-scroll-proportion="0.0">
@ -1113,10 +1072,36 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/dist/js/app.js"> <entry file="file://$PROJECT_DIR$/gulpfile.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0"> <state vertical-scroll-proportion="0.0">
<caret line="0" column="20" selection-start-line="0" selection-start-column="20" selection-end-line="0" selection-end-column="20" /> <caret line="30" column="38" selection-start-line="30" selection-start-column="5" selection-end-line="30" selection-end-column="40" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/.jshintrc">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-7.1923075">
<caret line="11" column="16" selection-start-line="11" selection-start-column="16" selection-end-line="11" selection-end-column="16" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/html/js/app.v3.js">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="56" column="11" selection-start-line="56" selection-start-column="11" selection-end-line="56" selection-end-column="11" />
<folding>
<element signature="e#0#43#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/dist/js/app.js">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.6081772">
<caret line="106" column="10" selection-start-line="106" selection-start-column="10" selection-end-line="106" selection-end-column="10" />
<folding /> <folding />
</state> </state>
</provider> </provider>

4
html/js/app.v3.js
View File

@ -54,9 +54,9 @@ var APP = function () {
var feedUrl = preUrl + feeds[refreshStep] + '.json'; var feedUrl = preUrl + feeds[refreshStep] + '.json';
$('#lastupdate').empty().append('Refreshing: ' + feeds[refreshStep]); $('#lastupdate').empty().append('Refreshing: ' + feeds[refreshStep]);
$.getJSON(feedUrl, function (data) { $.getJSON(feedUrl, function (data) {
console.log(self); // console.log(self);
self.doUpdate(data); doUpdate(data);
}); });
} else { } else {
console.log('Done'); console.log('Done');

1
html/lifestyle.json
View File

File diff suppressed because one or more lines are too long