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 13:30:37 +00:00
parent feda307dfe
commit b13115762d
2 changed files with 63 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

107
.idea/workspace.xml
View File

@ -4,10 +4,6 @@
<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="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$/gulpfile.js" afterPath="$PROJECT_DIR$/gulpfile.js" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/lifestyle.js" afterPath="$PROJECT_DIR$/lifestyle.js" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/news.js" afterPath="$PROJECT_DIR$/news.js" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/paleo.js" afterPath="$PROJECT_DIR$/paleo.js" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/tech.js" afterPath="$PROJECT_DIR$/tech.js" />
</list> </list>
<ignored path="rinser.iws" /> <ignored path="rinser.iws" />
<ignored path=".idea/workspace.xml" /> <ignored path=".idea/workspace.xml" />
@ -117,7 +113,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="81" column="3" selection-start-line="81" selection-start-column="3" selection-end-line="81" selection-end-column="3" /> <caret line="82" column="3" selection-start-line="82" selection-start-column="3" selection-end-line="82" selection-end-column="3" />
<folding /> <folding />
</state> </state>
</provider> </provider>
@ -137,10 +133,10 @@
</split-first> </split-first>
<split-second> <split-second>
<leaf> <leaf>
<file leaf-file-name="paleo.js" pinned="false" current-in-tab="true"> <file leaf-file-name="paleo.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/paleo.js"> <entry file="file://$PROJECT_DIR$/paleo.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.55025554"> <state vertical-scroll-proportion="0.0">
<caret line="82" column="35" selection-start-line="82" selection-start-column="35" selection-end-line="82" selection-end-column="35" /> <caret line="82" column="35" selection-start-line="82" selection-start-column="35" selection-end-line="82" selection-end-column="35" />
<folding /> <folding />
</state> </state>
@ -151,17 +147,17 @@
<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="30" column="21" selection-start-line="30" selection-start-column="5" selection-end-line="30" selection-end-column="21" /> <caret line="39" column="34" selection-start-line="39" selection-start-column="34" selection-end-line="39" selection-end-column="34" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="app.js" pinned="false" current-in-tab="false"> <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.0">
<caret line="0" column="44" selection-start-line="0" selection-start-column="44" selection-end-line="0" selection-end-column="44" /> <caret line="0" column="20" selection-start-line="0" selection-start-column="20" selection-end-line="0" selection-end-column="20" />
<folding /> <folding />
</state> </state>
</provider> </provider>
@ -192,10 +188,7 @@
<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="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding> <folding />
<marker date="1458047805751" expanded="true" signature="50028:50029" placeholder="//..." />
<marker date="1458047805751" expanded="true" signature="50029:50253" placeholder="/** jQuery Unveil ...*/" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
@ -281,15 +274,15 @@
<option value="$PROJECT_DIR$/html/js/app.v3.js" /> <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/js/vendor.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$/dist/js/app.js" />
<option value="$PROJECT_DIR$/html/js/shell.js" /> <option value="$PROJECT_DIR$/html/js/shell.js" />
<option value="$PROJECT_DIR$/gulpfile.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" />
</list> </list>
</option> </option>
</component> </component>
@ -363,7 +356,25 @@
<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_ELEMENT> <PATH_ELEMENT>
<option name="myItemId" value="html" /> <option name="myItemId" value="dist" />
<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="dist" />
<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" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT> </PATH_ELEMENT>
</PATH> </PATH>
@ -644,7 +655,13 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1458047741619</updated> <updated>1458047741619</updated>
</task> </task>
<option name="localTasksCounter" value="24" /> <task id="LOCAL-00024" summary="Updating to Version 3">
<created>1458048034591</created>
<option name="number" value="00024" />
<option name="project" value="LOCAL" />
<updated>1458048034591</updated>
</task>
<option name="localTasksCounter" value="25" />
<servers /> <servers />
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
@ -755,6 +772,7 @@
<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="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
@ -1023,17 +1041,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/dist/js/vendor.js">
<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>
<marker date="1458047805751" expanded="true" signature="50028:50029" placeholder="//..." />
<marker date="1458047805751" expanded="true" signature="50029:50253" placeholder="/** jQuery Unveil ...*/" />
</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="4.923077"> <state vertical-scroll-proportion="4.923077">
@ -1042,14 +1049,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/dist/js/app.js">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="0" column="44" selection-start-line="0" selection-start-column="44" selection-end-line="0" selection-end-column="44" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/html/js/shell.js"> <entry file="file://$PROJECT_DIR$/html/js/shell.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">
@ -1058,17 +1057,9 @@
</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="81" column="3" selection-start-line="81" selection-start-column="3" selection-end-line="81" selection-end-column="3" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/paleo.js"> <entry file="file://$PROJECT_DIR$/paleo.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.55025554"> <state vertical-scroll-proportion="0.0">
<caret line="82" column="35" selection-start-line="82" selection-start-column="35" selection-end-line="82" selection-end-column="35" /> <caret line="82" column="35" selection-start-line="82" selection-start-column="35" selection-end-line="82" selection-end-column="35" />
<folding /> <folding />
</state> </state>
@ -1106,5 +1097,29 @@
</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">
<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$/dist/js/app.js">
<provider selected="true" editor-type-id="text-editor">
<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" />
<folding />
</state>
</provider>
</entry>
</component> </component>
</project> </project>

3
gulpfile.js
View File

@ -28,7 +28,7 @@ gulp.task('scripts', function() {
.pipe(concat('app.js')) .pipe(concat('app.js'))
/*.pipe(gulp.dest('dist/js'))*/ /*.pipe(gulp.dest('dist/js'))*/
/*.pipe(rename({suffix: '.min'}))*/ /*.pipe(rename({suffix: '.min'}))*/
.pipe(uglify()) .pipe(uglify({mangle: false}))
/*.pipe(concat('app.js'))*/ /*.pipe(concat('app.js'))*/
.pipe(gulp.dest('dist/js')) .pipe(gulp.dest('dist/js'))
.pipe(notify({ message: 'Scripts task complete' })); .pipe(notify({ message: 'Scripts task complete' }));
@ -37,6 +37,7 @@ gulp.task('scripts', function() {
gulp.task('vendor', function() { gulp.task('vendor', function() {
return gulp.src(['html/libs/microevent.js','html/js/moment.min.js','html/js/ejs_production.js','html/js/jquery.unveil.js']) return gulp.src(['html/libs/microevent.js','html/js/moment.min.js','html/js/ejs_production.js','html/js/jquery.unveil.js'])
.pipe(concat('vendor.js')) .pipe(concat('vendor.js'))
.pipe(uglify({mangle: false}))
.pipe(gulp.dest('dist/js')) .pipe(gulp.dest('dist/js'))
.pipe(notify({ message: 'Scripts task complete' })); .pipe(notify({ message: 'Scripts task complete' }));
}); });