Commit Graph
67 Commits
Author SHA1 Message Date
David Morse 2b0f9963ef fix(gridster): Add additiona error checking on widgets removal
…when remove_widget is called with an empty element we need to abandon the action early to avoid exceptions
2015-06-25 21:45:09 -06:00
David Morse 4936ef82c0 fix: convert from JQury to DOM
Move from Jquery based width() for calculations to dom calls to avoid conflicts with webcomponents.js polyfills
2015-06-08 21:26:40 -06:00
David Morse 1812366c0f feature: Add Chaos demo to test widget placement. 2015-06-04 22:09:17 -06:00
David Morse 1bb8888ec9 chore: convert from css to Less 2015-06-04 21:29:33 -06:00
David Morse 3c1013589e chore: Merge remote-tracking branch 'mergeSource/master'
Add jspm support
2015-06-04 20:15:03 -06:00
David Morse 9abe8c2cca chore: Merge remote-tracking branch 'josephndenton/master'
fixed highlighting while resize is true
2015-06-04 19:57:48 -06:00
David Morse 393b4fc9ec chore: Merge remote-tracking branch 'spalger/master' - make npm ready 2015-06-04 19:41:11 -06:00
David Morse c5da395c53 chore: update RoR build process
Prep for 0.6.10 release.
2015-05-31 10:34:56 -06:00
David Morse aa598a5f9e Merge branch 'master' of https://github.com/dsmorse/gridster.js
updates to make ruby on rails gem work. see pull Request #14 & #15
2015-05-31 10:16:20 -06:00
David Morse 89978099a8 update readme 2015-05-28 20:41:11 -06:00
David Morse 57bf55a8e5 update ruby build config 2015-05-28 20:33:28 -06:00
David Morse 0ab1348707 Release v0.6.9 2015-05-27 22:14:29 -06:00
David Morse 35426a0ca9 add badge for gem 2015-05-27 22:10:40 -06:00
David Morse aa2053b6c6 install bower & grunt globally for travis 2015-05-27 15:55:56 -06:00
David Morse 589864ce36 travis config for bower 2015-05-27 15:47:32 -06:00
David Morse 818321958c enable travis 2015-05-27 15:42:56 -06:00
David Morse 4cc6915101 Remove if statement from register_widgets that cause them to be dropped from the DOM if they don't have a specific class on them. Fixes bug report #9 2015-05-26 22:15:51 -06:00
David Morse b0ead24af1 add unit test to build process 2015-05-20 22:00:17 -06:00
David Morse d23aa41757 Various bug fixes for moving widgets around 2015-05-20 01:14:03 -06:00
David Morse 0c65f0ab5d JS Doc changes 2015-05-19 20:06:17 -06:00
David Morse 610a143239 Fix expanding widget issue (allow it to collapse again) 2015-05-18 21:46:46 -06:00
David Morse 3cc6192577 Merge branch 'master' of git://github.com/zeroedin-bill/gridster.js into zeroedin-bill-master 2015-05-18 21:30:58 -06:00
David Morse 08da4a4d74 fix unit tests 2015-05-18 21:17:13 -06:00
David Morse de59d89933 Merge branch 'zeroedin-bill-master' 2015-05-18 12:25:46 -06:00
David Morse af979faaf5 fix initialization of sticky layout. 2015-05-18 12:20:36 -06:00
David Morse fa6de00e3a Remove debug code 2015-05-18 02:37:53 -06:00
David Morse 4d946ead88 Fix bug with responsive layout if grid in wrapped in a container which has padding. It now limits the width of the widget to the containing element (also helps with scrollbars) 2015-05-13 12:15:05 -06:00
David Morse 699fad9d06 Release v0.6.8 2015-04-28 21:25:41 -06:00
David Morse 9732b017eb Merge commit 'e69c3e8f64aa4557ef032e4d0d8185e83b1aed21'
fix(gridster): responsive width now resizes based off wrapper not window
2015-04-28 21:18:55 -06:00
David Morse 8473bd6d9d update dependencies and jshint 2015-04-28 21:00:24 -06:00
David Morse 3a696ad732 0.6.7 release 2015-04-16 15:05:15 -06:00
David Morse 57a2604365 rev jquery version 2015-04-16 15:01:31 -06:00
David Morse 7af6bf7a98 Add unit testing for core API, ensure all demos work, and add unit testing to ensure they stay working. 2015-04-12 23:26:19 -06:00
David Morse 385cc757ac bring the Demo's into master for testing & Automate the updates to gh-pages branch 2015-04-10 12:26:54 -06:00
David Morse 69f9c81d48 Update Samples 2015-04-09 08:37:29 -06:00
David Morse 59b475d0d1 Merge commit '6eb521015cda5212f6fa92492dbe4050bd92e00c'
* commit '6eb521015cda5212f6fa92492dbe4050bd92e00c':
  Update Readme
  Updated sample
  Better handling of widgets slideing down
  update readme
  rebuilt dist
  Added Swap Demo
  Added disabled dragging init feature gridster.js
  Working on Static widgets
2015-04-09 00:25:16 -06:00
David Morse f29ab737ed Merge from dustmoo/gridster.js
* commit '8f431a423302c7c58f511d5ede9270077993f9b3':
  Updated Readme
  Updated Readme
  Version Updates
  Serialize bug fix
  Added max_rows and drag restriction - ready for integration :)
  Removed console.logs
  Removed console.logs
  Good enough swap logic for now
  Swap queue awesomeness
  Swap queue awesomeness
  Fix row issue
  working on map grid functionality
2015-04-08 23:48:53 -06:00
David Morse 0cd0af947b Merge from dustmoo/gridster.js
* commit '262d115cf8b5bdaed40a7e5b6aaa6df6e71b6a07':
  Added swaping queue, better handling of large to small swaps
  Added swaping queue, better handling of large to small swaps
  More predictable default behavior
  Updated Readme
  Added property to prevent larger widget shifting
  Added grid-swap behavior
2015-04-08 23:22:58 -06:00
David Morse 08628126f5 Fix my merge error from the merge from remote-tracking branch 'cpascu/gridster.js/faux-rows-patch' 2015-04-08 22:40:49 -06:00
David Morse 8f6d18ea9a Release v0.6.6 2015-04-08 09:44:39 -06:00
David Morse 853e1fc72e Update Readme 2015-04-08 09:37:06 -06:00
David Morse a908eaecae Merge remote-tracking branch 'Laboratory/gridster.js.git/master'
* Laboratory/gridster.js.git/master:
  delete jquery dependency
2015-04-08 09:04:08 -06:00
David Morse 4e2697e3d4 Merge remote-tracking branch 'yfix/gridster.js.git/master'
* yfix/gridster.js.git/master:
2015-04-08 08:36:18 -06:00
David Morse c220ecf311 Merge remote-tracking branch 'rebugger/gridster.js.git/resize-widget-dimensions'
* rebugger/gridster.js.git/resize-widget-dimensions:
  fix min-width and min-height after resize
  add resize_widget_dimension() resize widgets after initialization
  fix min-width and min-height after resize
  add resize_widget_dimension() resize widgets after initialization
2015-04-08 08:22:51 -06:00
David Morse e77e8d7e61 Merge remote-tracking branch 'andreas-trad/gridster.js.git/patch-1'
* andreas-trad/gridster.js.git/patch-1:
  Prevent multi <style> generation
2015-04-08 08:13:58 -06:00
David Morse b87c0113c3 Merge remote-tracking branch 'kwak27/gridster.js/fix_add_widget'
* kwak27/gridster.js/fix_add_widget:
  fix add_widget to use correct size_y when adding rows
2015-04-08 08:04:03 -06:00
David Morse 2acdff1056 Merge remote-tracking branch 'AdrianTeh/gridster.js.git/master'
* AdrianTeh/gridster.js.git/master:
  fixes-add-widget-overlapping-issue-#340
2015-04-08 07:19:26 -06:00
David Morse 524ed2bb99 Merge remote-tracking branch 'dasmall/gridster.js.git/master'
* dasmall/gridster.js.git/master:
  Removing previously added style tags before adding new one. Hopefully fixes #211 and #294.
2015-04-08 07:14:45 -06:00
David Morse 7ee8824250 Merge remote-tracking branch 'cpascu/gridster.js/faux-rows-patch'
* cpascu/gridster.js/faux-rows-patch:
  Fixed typeof comparison to match against string.
  Fixed issue where existing widget position would be overwritten on gridmap when adding a faux cell to accommodate another widget.
2015-04-08 07:06:12 -06:00
David Morse 56e9f62912 Merge remote-tracking branch 'AWhetter/gridster.js/fix_doc_typo'
* AWhetter/gridster.js/fix_doc_typo:
  Fixed a typo in Gridster class documentation
2015-04-07 22:40:45 -06:00
David Morse 0d9d5c2833 Merge remote-tracking branch 'dragonier/gridster.js/master'
* dragonier/gridster.js/master:
  add_resize_handle: multiple span (resizeable) entries in widgets
2015-04-07 22:30:38 -06:00
David Morse 35ba767c55 Merge remote-tracking branch 'Tropicalista/gridster.js/master' 2015-04-07 22:25:02 -06:00
David Morse 0b08e1fb81 Merge remote-tracking branch 'aegisrunestone/gridster.js/master'
* aegisrunestone/gridster.js/master:
  Changed "instanceof jQuery" to "instanceof $"
2015-04-07 22:22:18 -06:00
David Morse 85bc2f47ec Merge remote-tracking branch 'rept/gridster.js/addition_problem_add_faux_rows'
* rept/gridster.js/addition_problem_add_faux_rows:
  Also added parseInt to the add_faux_cols method
  Also added parseInt to the add_faux_cols method
  Wrong addition solved in add_faux_rows by adding parseInt
2015-04-07 22:19:48 -06:00
David Morse 6d5e8ed248 Merge remote-tracking branch 'joaoafrmartins/gridster.js/master'
* joaoafrmartins/gridster.js/master:
  commonjs
  support UMD
2015-04-07 22:09:10 -06:00
David Morse 3810daef1b Merge remote-tracking branch 'Toosick/gridster.js/patch-1'
* Toosick/gridster.js/patch-1:
  Update jquery.gridster.js
  Fix gridster destroy
2015-04-07 21:51:55 -06:00
David Morse 84598f6862 Merge remote-tracking branch 'mooglemoogle/gridster.js/master'
* mooglemoogle/gridster.js/master:
  Added destroy of widget coords and resize api
  Added ability to specify scroll container for drag/resize
2015-04-07 21:36:00 -06:00
David Morse e7509f0220 Merge remote-tracking branch 'bfarka/gridster.js/fix-trailing-comma'
* bfarka/gridster.js/fix-trailing-comma:
  fix issue #469
2015-04-07 20:03:36 -06:00
David Morse 72007139cb Merge remote-tracking branch 'sogawa/gridster.js/strict-sort'
* sogawa/gridster.js/strict-sort:
  Convert to integer type of property value when sorting.
  add element "#qunit-testresult"
  rename test files.
2015-04-07 19:56:44 -06:00
David Morse acd80b4039 Merge remote-tracking branch 'Roger-Waters/gridster.js'
*   Fix spelling mistake
2015-04-07 19:30:34 -06:00
David Morse 5b1dfbec94 Merge remote-tracking branch 'ducksboard/bug-493-jquery-no-global-fail'
* ducksboard/bug-493-jquery-no-global-fail:
  Fix for bug #493 including unit tests to prove.
2015-04-07 19:24:36 -06:00
David Morse cec85c59a7 Merge remote-tracking branch 'eric/master'
Grunt changes
  Add an optional final parameter to add_widget.
  Bumping to v0.5.7
  Grunt
  Fix Widget Right Edge Collission Detection
  re-name model_id parameter
  add model_id parameter to add_widget method in order to create a relationship between widget and backbone model
  Fix the memory leak that was incorrectly iterating rows and columns
  Cache $(window) and $(this) selectors for performance
  fix (Gridster.js):  destroy  resize_api
2015-04-07 13:50:05 -06:00
David Morse 37d8e0ec25 Merge from abril/gridster.js
* merging:
  add function move_widget in dist/jquery.gridster.js
  Include move_widget function (Move a widget to a specific row and column.).
  Change jQuery reference for $.
2015-04-07 11:55:30 -06:00
David Morse 4783e6e726 fix a NAN error that could occur if using center_widget if the grid was in responsive mode.
Error check the shift cols, to ensure they can't move left past col 1
make a change from 100% to 100VW for better browser support of min-width
2015-04-06 22:49:51 -06:00
David Morse ec430f816f Merge branch 'master' of https://github.com/DecksterTeam/gridster.js 2015-04-06 22:33:20 -06:00
David Morse 3ec0c6fa6e Move the check for responsive width above the calculations of width. This will prevent the calculated values changing the width for browsers which don't respect min-width 2015-04-04 22:38:23 -06:00
David Morse aa8f4bf3d0 Move the check for responsive width above the calculations of width. This will prevent the calculated values changing the width for browsers which don't respect min-width 2015-04-04 22:11:16 -06:00