Whitespace and VS project file improvements

SierraSoftworks · Jan 23, 2014 · e3fb2ce · e3fb2ce
1 parent ad8c1fc
commit e3fb2ce
Show file tree

Hide file tree

Showing 8 changed files with 156 additions and 181 deletions.
diff --git a/Iridium.csproj b/Iridium.csproj
diff --git a/Iridium.njsproj b/Iridium.njsproj
@@ -0,0 +1,134 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+    <PropertyGroup>
+        <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+        <SchemaVersion>2.0</SchemaVersion>
+        <ProjectGuid>{a2511e8c-33be-4b8d-8203-70d403aa446a}</ProjectGuid>
+        <ProjectHome />
+        <ProjectView>ShowAllFiles</ProjectView>
+        <StartupFile>index.js</StartupFile>
+        <WorkingDirectory>.</WorkingDirectory>
+        <OutputPath>.</OutputPath>
+        <ProjectTypeGuids>{3AF33F2E-1136-4D97-BBB7-1795711AC8B8};{349c5851-65df-11da-9384-00065b846f21};{9092AA53-FB77-4645-B42D-1CCCA6BD08BD}</ProjectTypeGuids>
+        <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">11.0</VisualStudioVersion>
+        <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
+    </PropertyGroup>
+    <PropertyGroup Condition="'$(Configuration)' == 'Debug'" />
+    <PropertyGroup Condition="'$(Configuration)' == 'Release'" />
+    <ItemGroup>
+        <Content Include="package.json" />
+        <Content Include="README.md" />
+        <Compile Include="index.js" />
+        <Content Include=".git\ms-persist.xml" />
+        <Compile Include="benchmarks\mongodb.js" />
+        <Compile Include="example\LowercaseCollectionsPlugin.js" />
+        <Compile Include="example\StringCaseValidationPlugin.js" />
+        <Compile Include="example\UserModel.js" />
+        <Compile Include="lib\Database.js" />
+        <Compile Include="lib\Instance.js" />
+        <Compile Include="lib\Model.js" />
+        <Compile Include="nodelib\assert.js" />
+        <Compile Include="nodelib\buffer.js" />
+        <Compile Include="nodelib\child_process.js" />
+        <Compile Include="nodelib\cluster.js" />
+        <Compile Include="nodelib\console.js" />
+        <Compile Include="nodelib\core.js" />
+        <Compile Include="nodelib\crypto.js" />
+        <Compile Include="nodelib\dgram.js" />
+        <Compile Include="nodelib\dns.js" />
+        <Compile Include="nodelib\domain.js" />
+        <Compile Include="nodelib\events.js" />
+        <Compile Include="nodelib\fs.js" />
+        <Compile Include="nodelib\http.js" />
+        <Compile Include="nodelib\https.js" />
+        <Compile Include="nodelib\lodash.js" />
+        <Compile Include="nodelib\mocha.js" />
+        <Compile Include="nodelib\module.js" />
+        <Compile Include="nodelib\net.js" />
+        <Compile Include="nodelib\node.js" />
+        <Compile Include="nodelib\os.js" />
+        <Compile Include="nodelib\path.js" />
+        <Compile Include="nodelib\process.js" />
+        <Compile Include="nodelib\punycode.js" />
+        <Compile Include="nodelib\querystring.js" />
+        <Compile Include="nodelib\readline.js" />
+        <Compile Include="nodelib\repl.js" />
+        <Compile Include="nodelib\should.js" />
+        <Compile Include="nodelib\stream.js" />
+        <Compile Include="nodelib\stringdecoder.js" />
+        <Compile Include="nodelib\superagent.js" />
+        <Compile Include="nodelib\supertest.js" />
+        <Compile Include="nodelib\tls.js" />
+        <Compile Include="nodelib\tty.js" />
+        <Compile Include="nodelib\url.js" />
+        <Compile Include="nodelib\util.js" />
+        <Compile Include="nodelib\vm.js" />
+        <Compile Include="nodelib\zlib.js" />
+        <Compile Include="test\cache.js" />
+        <Compile Include="test\config.js" />
+        <Compile Include="test\diff.js" />
+        <Compile Include="test\findOne.js" />
+        <Compile Include="test\hooks.js" />
+        <Compile Include="test\insertion.js" />
+        <Compile Include="test\instance_db.js" />
+        <Compile Include="test\instance_helpers.js" />
+        <Compile Include="test\instance_setup.js" />
+        <Compile Include="test\model.js" />
+        <Compile Include="test\plugins.js" />
+        <Compile Include="test\validation.js" />
+        <Compile Include="lib\caches\NoOpCache.js" />
+        <Compile Include="lib\utils\diff.js" />
+        <Compile Include="lib\utils\String.js" />
+        <Compile Include="lib\utils\validation.js" />
+    </ItemGroup>
+    <ItemGroup>
+        <Folder Include=".git" />
+        <Folder Include="benchmarks" />
+        <Folder Include="example" />
+        <Folder Include="lib" />
+        <Folder Include="lib\caches" />
+        <Folder Include="lib\utils" />
+        <Folder Include="nodelib" />
+        <Folder Include="test" />
+    </ItemGroup>
+    <Import Project="$(MSBuildToolsPath)\Microsoft.Common.targets" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+    <Import Project="$(VSToolsPath)\Node.js Tools\Microsoft.NodejsTools.targets" />
+    <ProjectExtensions>
+        <VisualStudio>
+          <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
+            <WebProjectProperties>
+              <UseIIS>False</UseIIS>
+              <AutoAssignPort>True</AutoAssignPort>
+              <DevelopmentServerPort>0</DevelopmentServerPort>
+              <DevelopmentServerVPath>/</DevelopmentServerVPath>
+              <IISUrl>http://localhost:48022/</IISUrl>
+              <NTLMAuthentication>False</NTLMAuthentication>
+              <UseCustomServer>True</UseCustomServer>
+              <CustomServerUrl>http://localhost:1337</CustomServerUrl>
+              <SaveServerSettingsInUserFile>False</SaveServerSettingsInUserFile>
+            </WebProjectProperties>
+          </FlavorProperties>
+          <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}" User="">
+            <WebProjectProperties>
+              <StartPageUrl>
+              </StartPageUrl>
+              <StartAction>CurrentPage</StartAction>
+              <AspNetDebugging>True</AspNetDebugging>
+              <SilverlightDebugging>False</SilverlightDebugging>
+              <NativeDebugging>False</NativeDebugging>
+              <SQLDebugging>False</SQLDebugging>
+              <ExternalProgram>
+              </ExternalProgram>
+              <StartExternalURL>
+              </StartExternalURL>
+              <StartCmdLineArguments>
+              </StartCmdLineArguments>
+              <StartWorkingDirectory>
+              </StartWorkingDirectory>
+              <EnableENC>False</EnableENC>
+              <AlwaysStartWebServerOnDebug>False</AlwaysStartWebServerOnDebug>
+            </WebProjectProperties>
+          </FlavorProperties>
+        </VisualStudio>
+    </ProjectExtensions>
+</Project>
diff --git a/Iridium.sln b/Iridium.sln
@@ -3,18 +3,18 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 2013
 VisualStudioVersion = 12.0.21005.1
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Iridium", "Iridium.csproj", "{A937B8F5-CB90-46AD-AB3C-1EBD8E827378}"
+Project("{9092AA53-FB77-4645-B42D-1CCCA6BD08BD}") = "Iridium", "Iridium.njsproj", "{A2511E8C-33BE-4B8D-8203-70D403AA446A}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{A937B8F5-CB90-46AD-AB3C-1EBD8E827378}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A937B8F5-CB90-46AD-AB3C-1EBD8E827378}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A937B8F5-CB90-46AD-AB3C-1EBD8E827378}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A937B8F5-CB90-46AD-AB3C-1EBD8E827378}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A2511E8C-33BE-4B8D-8203-70D403AA446A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A2511E8C-33BE-4B8D-8203-70D403AA446A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A2511E8C-33BE-4B8D-8203-70D403AA446A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A2511E8C-33BE-4B8D-8203-70D403AA446A}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/lib/Database.js b/lib/Database.js
@@ -1,4 +1,3 @@
-/// <reference path="../nodelib/node.js"/>
 /// <reference path="Model.js"/>
 /// <reference path="Instance.js"/>
 
@@ -23,7 +22,6 @@ function Database(config) {
 
 	Object.defineProperty(this, 'settings', {
 		get: function () {
-			"use strict";
 			return config;
 		},
 		enumerable: false

diff --git a/lib/Instance.js b/lib/Instance.js
@@ -50,7 +50,7 @@ function Instance(model, doc, isNew) {
 	this.emit('ready', this);
 }
 
-Instance.prototype.prototype = EventEmitter.prototype;
+Instance.prototype.__proto__ = EventEmitter.prototype;
 
 Object.defineProperty(Instance.prototype, 'document', {
 	get: function() { return this.__state.modified; },
@@ -351,7 +351,7 @@ Instance.forModel = function(model) {
 			});
 	});
 
-	proto.prototype = Instance.prototype;
+	proto.__proto__ = Instance.prototype;
 
 	_.each(model.options.methods, function(method, name) {
 		proto[name] = method;