Skip to content

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
...
Checking mergeability… Don’t worry, you can still create the pull request.
  • 10 commits
  • 11 files changed
  • 0 commit comments
  • 4 contributors
Commits on Nov 09, 2011
@togakangaroo restructured to closer resemble nuget package. Added some administrat…
…ive links and removed readme
7b13932
@togakangaroo deleted unused files 4ab5900
Commits on Nov 10, 2011
Surge Consulting Group Update README.md cc80d21
Commits on Dec 05, 2011
@togakangaroo Update to v 1.0.2 minor fixes and default sorting order implementation d2c797d
@togakangaroo merged readme e3f3553
Commits on Mar 21, 2012
unknown changed docs to Surge.Define a19920e
Commits on Mar 22, 2012
@togakangaroo - Added yesno special column
- Fixes to bad unprefixed namespaces
- Added a special edit column
- Now raise celldoubleclick event and call column's onDblClick callback
- Fixed tabbing on/off LongTextCellEditor
- Set slickgrid autoHeight option
- Added escapeHtml option that escapes html when no formatter is provided
- Grid search core moved into optional Surge.Utility. No longer available
- Fix default slickgrid formatter to not print 'null' on null
- Fix grid datepicker bug populating 12/31/1969 when date is empty.
- Minor bugfixes to grid widget
61a783a
@togakangaroo updated nuspec to v2.0.0 (using semantic versioning) d5d0b1e
@togakangaroo added release notes 959fc07
Commits on Aug 01, 2013
@togakangaroo Update README.md 9db1bd5
View
0 Content/slick.grid.css → Content/Content/slick.grid.css
File renamed without changes.
View
10 Content/surge.slickGrid.css → Content/Content/surge.slickGrid.css
@@ -1,3 +1,7 @@
+.surge-slickGrid-loaded-marker {
+ z-index: -98256;
+ display: none; }
+
[data-widget=slickGrid] table {
display: none; }
@@ -24,6 +28,12 @@
height: 200px;
background: #fff;
clear: both; }
+ .sfx-grid div {
+ box-sizing: content-box;
+ -moz-box-sizing: content-box;
+ -webkit-box-sizing: content-box;
+ -khtml-box-sizing: content-box;
+ -o-box-sizing: content-box; }
.sfx-grid .slick-header-column, .sfx-grid .slick-header-columns {
background: #eee none !important;
color: #000 !important; }
View
0 Scripts/slick.grid.js → Content/Scripts/slick.grid.js
File renamed without changes.
View
102 Scripts/surge.core.js → Content/Scripts/surge.core.js
@@ -101,56 +101,56 @@
});
Define('Surge', {
- // Function: Surge.Class
- // Defines a new class. Details TBD.
- //
- // Example:
- // (code)
- // Class("MyApp.NiftyThing", Surge.Component, {
- // MyProperty: new Surge.Property(), // auto property
- // MyTrackedProperty: new Surge.Property({changeTracked: true}), // see below
- //
- // constructor: function (myProperty) {
- // this.setMyProperty(myProperty); // setter is defined automatically
- // },
- //
- // someMethod: function () {
- // return this.getMyProperty() * 100;
- // },
- //
- // $staticMethod: function () {
- // alert("It's super effective!");
- // }
- // });
- //
- // var instance = new MyApp.NiftyThing(10);
- // alert(instance.someMethod());
- // MyApp.NiftyThing.staticMethod();
- // instance.listen('valueChanged', function (propertyName, oldValue, newValue) {
- // alert(newValue);
- // });
- // instance.setMyTrackedProperty(7);
- // (end)
- Class: Class,
- // Function: Surge.Define
- //
- // Adds a dictionary of items at a named location, creating any intermediate objects required.
- //
- // Parameters:
- // ns - The name of a namespace. This should be a dotted list of components, e.g. Surge.Math.Geometry.
- // dict - An object. Each property of the object will be added to the namespace referenced by ns.
- //
- // Example:
- // (begin code)
- // Define("Foo.Bar", {
- // hello: function () {
- // alert("Hello, World!");
- // }
- // });
- //
- // Foo.Bar.hello();
- // (end)
- Define: Define
+ // Function: Class
+ // Defines a new class. Details TBD.
+ //
+ // Example:
+ // (code)
+ // Class("MyApp.NiftyThing", Surge.Component, {
+ // MyProperty: new Surge.Property(), // auto property
+ // MyTrackedProperty: new Surge.Property({changeTracked: true}), // see below
+ //
+ // constructor: function (myProperty) {
+ // this.setMyProperty(myProperty); // setter is defined automatically
+ // },
+ //
+ // someMethod: function () {
+ // return this.getMyProperty() * 100;
+ // },
+ //
+ // $staticMethod: function () {
+ // alert("It's super effective!");
+ // }
+ // });
+ //
+ // var instance = new MyApp.NiftyThing(10);
+ // alert(instance.someMethod());
+ // MyApp.NiftyThing.staticMethod();
+ // instance.listen('valueChanged', function (propertyName, oldValue, newValue) {
+ // alert(newValue);
+ // });
+ // instance.setMyTrackedProperty(7);
+ // (end)
+ Class: Class,
+ // Function: Define
+ //
+ // Adds a dictionary of items at a named location, creating any intermediate objects required.
+ //
+ // Parameters:
+ // ns - The name of a namespace. This should be a dotted list of components, e.g. Surge.Math.Geometry.
+ // dict - An object. Each property of the object will be added to the namespace referenced by ns.
+ //
+ // Example:
+ // (begin code)
+ // Surge.Define("Foo.Bar", {
+ // hello: function () {
+ // alert("Hello, World!");
+ // }
+ // });
+ //
+ // Foo.Bar.hello();
+ // (end)
+ Define: Define
});
@@ -421,7 +421,7 @@
// This prevents fatal exceptions from occuring in code in some browsers.
//
// Surge.Console.log and Surge.Console.error are aliased as _log and _error.
- Define("Surge.Console", {
+ Surge.Define("Surge.Console", {
_backlog: [],
_groupDepth: 0, // Used by software emulated begin/end group
_times: {},
View
1,907 Content/Scripts/surge.slickGrid.js
1,907 additions, 0 deletions not shown because the diff is too large. Please use a local Git client to view these changes.
View
0 Surge.SlickGrid.Extensions-license.txt → ...nt/Surge.SlickGrid.Extensions-license.txt
File renamed without changes.
View
6 README.md
@@ -2,7 +2,7 @@ About
=====
The Surge SlickGrid Extensions provided by the Surge Consulting Group is a set of open-sourced tools that will make using grids in your application a breeze. The product can be conceptually broken down into the following:
-* A jQuery widget which wraps the open-source SlickGrid tool and gives an api for working with it that is more natural to a jQuery user. This includes the ability to define grid columns in mark-up.
+* A jQuery widget which wraps the open-source [SlickGrid tool](https://github.com/mleibman/SlickGrid) and gives an api for working with it that is more natural to a jQuery user. This includes the ability to define grid columns in mark-up.
* Various extensions that add some nice bits of functionality to the widget. Including:
* Use jQuery Templates for Headers, Footers, and formatting columns
* JSONDataSource object to easily support bottomless scrolling
@@ -35,7 +35,7 @@ Always check the browser console log for errors that might occur due to missing
References
==========
* [Surge Consulting Group](http://www.surgeforward.com/)
- * [Introductory Tutorial Index](http://blog.surgeforward.com/node/17)
+ * [Introductory Tutorial Index](https://github.com/surgeforward/Surge-SlickGrid-Extensions/wiki/Announcing-Surge-Slickgrid-Extensions)
* [SlickGrid Extensions Demo](http://platformdemo.surgeforward.com/Grid/)
* [Surge API Reference](http://docs.surgeforward.com/Javascript/files/surge-slickGrid-js.html)
- * [Original SlickGrid Documentation](http://github.com/mleibman/SlickGrid/wiki)
+ * [Original SlickGrid Documentation](http://github.com/mleibman/SlickGrid/wiki)
View
1,856 Scripts/surge.slickGrid.js
0 additions, 1,856 deletions not shown because the diff is too large. Please use a local Git client to view these changes.
View
34 Surge.SlickGrid.Extensions.nuspec
@@ -0,0 +1,34 @@
+<?xml version="1.0"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
+ <metadata>
+ <id>Surge.SlickGrid.Extensions</id>
+ <version>2.0.1</version>
+ <title>SlickGrid and Surge SlickGrid Extensions</title>
+ <authors>Surge Consulting Group</authors>
+ <owners>Surge Consulting Group</owners>
+ <licenseUrl>https://github.com/surgeforward/Surge-SlickGrid-Extensions/blob/master/Surge.SlickGrid.Extensions-license.txt</licenseUrl>
+ <projectUrl>http://github.com/surgeforward/Surge-SlickGrid-Extensions</projectUrl>
+ <requireLicenseAcceptance>false</requireLicenseAcceptance>
+ <description>The Surge SlickGrid Extensions is a set of open-sourced tools that will make using grids in your application a breeze.</description>
+ <summary>Super-powered jQuery Ui Widget for interacting with the SlickGrid javascript grid.</summary>
+ <releaseNotes>
+ - Added yesno special column
+ - Fixes to bad unprefixed namespaces
+ - Added a special edit column
+ - Now raise celldoubleclick event and call column's onDblClick callback
+ - Fixed tabbing on/off LongTextCellEditor
+ - Set slickgrid autoHeight option
+ - Added escapeHtml option that escapes html when no formatter is provided
+ - Grid search core moved into optional Surge.Utility. No longer available
+ - Fix default slickgrid formatter to not print 'null' on null
+ - Fix grid datepicker bug populating 12/31/1969 when date is empty.
+ - Minor bugfixes to grid widget
+ </releaseNotes>
+ <language>en-US</language>
+ <tags>jQuery jQueryUI plugins widgets grid javascript</tags>
+ <dependencies>
+ <dependency id="jQuery" version="1.4.4" />
+ <dependency id="jQuery.UI.Combined" version="1.8.16" />
+ </dependencies>
+ </metadata>
+</package>
View
41 Tools/README.txt
@@ -1,41 +0,0 @@
-About
-=====
-The Surge SlickGrid Extensions provided by the Surge Consulting Group is a set of open-sourced tools that will make using grids in your application a breeze. The product can be conceptually broken down into the following:
-
-* A jQuery widget which wraps the open-source SlickGrid tool and gives an api for working with it that is more natural to a jQuery user. This includes the ability to define grid columns in mark-up.
-* Various extensions that add some nice bits of functionality to the widget. Including:
- * Use jQuery Templates for Headers, Footers, and formatting columns
- * JSONDataSource object to easily support bottomless scrolling
- * Commonly referenced "Special Columns" and formatter aliases
-* A standard set of editors and formatters.
-* Utility code in the Surge namespace that is used in implementing the above.
-
-Installation
-============
-As Surge.SlickGrid Extensions is entirely a client-side library just reference the provided javascript and css files as you normally would. [See article.](http://blog.surgeforward.com/node/22)
-
-Dependencies
-============
-Surge SlickGrid Extensions currently has the following dependencies:
-
-* **Required** - Surge SlickGrid will not run without the following
- * [jQuery](http://jquery.com) (not included)
- * [jQuery UI widget factory](http://jqueryui.com/download) (not included)
- * SlickGrid v1.4.3 (included slick.grid.css, slick.grid.js) - SlickGrid v2.0 support is experimental
- * Surge.Core (included surge.core.js)
- * Surge.SlickGrid (included surge.slickGrid.css, surge.slickGrid.js)
-* **Optional** - Certain features of Surge SlickGrid will not work without the following
- * [jQuery.event.drag 2.0](http://threedubmedia.com/code/event/drag)
- * [jQuery Templates](http://api.jquery.com/category/plugins/templates/)
- * [jQuery Globalize](http://wiki.jqueryui.com/w/page/39118647/Globalize)
- * [jQuery TimeEntry](http://keith-wood.name/timeEntry.html)
-
-Always check the browser console log for errors that might occur due to missing dependencies.
-
-References
-==========
- * [Surge Consulting Group](http://www.surgeforward.com/)
- * [Introductory Tutorial Index](http://blog.surgeforward.com/node/17)
- * [SlickGrid Extensions Demo](http://platformdemo.surgeforward.com/Grid/)
- * [Surge API Reference](http://docs.surgeforward.com/Javascript/files/surge-slickGrid-js.html)
- * [Original SlickGrid Documentation](http://github.com/mleibman/SlickGrid/wiki)
View
2 Tools/install.ps1
@@ -1,4 +1,4 @@
param($installPath, $toolsPath, $package, $project)
-$readme = Join-Path $toolsPath ReadMe.txt
+$readme = (Join-Path (Join-Path $toolsPath ..) ReadMe.md)
$DTE.ItemOperations.OpenFile($readme)

No commit comments for this range

Something went wrong with that request. Please try again.