Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,3 @@ dist/*.js
demo/*
spec/*
src/jquery-ui.js
src/jquery-ui.min.js
2 changes: 1 addition & 1 deletion Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ module.exports = function(grunt) {
'dist/gridstack.jQueryUI.js': ['src/gridstack.jQueryUI.js'],
'dist/gridstack-poly.js': ['src/gridstack-poly.js'],
'dist/jquery-ui.js': ['src/jquery-ui.js'],
'dist/jquery-ui.min.js': ['src/jquery-ui.min.js'],
}
}
},
Expand All @@ -58,6 +57,7 @@ module.exports = function(grunt) {
'dist/gridstack.min.js': ['src/gridstack.js'],
'dist/gridstack.jQueryUI.min.js': ['src/gridstack.jQueryUI.js'],
'dist/gridstack-poly.min.js': ['src/gridstack-poly.js'],
'dist/jquery-ui.min.js': ['src/jquery-ui.js'],
'dist/gridstack.all.js': ['src/gridstack-poly.js', 'src/gridstack.js', 'src/jquery-ui.js', 'src/gridstack.jQueryUI.js']
}
}
Expand Down
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "gridstack",
"version": "0.5.4-dev",
"version": "0.5.5",
"homepage": "https://github.com/gridstack/gridstack.js",
"authors": [
"Pavel Reznikov <pashka.reznikov@gmail.com>",
Expand Down
2 changes: 1 addition & 1 deletion demo/advance.html
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<script type="module" src="https://unpkg.com/ionicons@4.5.10-0/dist/ionicons/ionicons.esm.js"></script>
<script nomodule="" src="https://unpkg.com/ionicons@4.5.10-0/dist/ionicons/ionicons.js"></script>
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.4.1/jquery.min.js"></script>
<script src="../src/jquery-ui.min.js"></script>
<script src="../dist/jquery-ui.min.js"></script>
<script src="../src/gridstack.js"></script>
<script src="../src/gridstack.jQueryUI.js"></script>

Expand Down
5 changes: 4 additions & 1 deletion demo/anijs.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,12 @@
<link rel="stylesheet" href="demo.css"/>

<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.4.1/jquery.min.js"></script>
<script src="../src/jquery-ui.min.js"></script>
<!--
<script src="../dist/jquery-ui.min.js"></script>
<script src="../src/gridstack.js"></script>
<script src="../src/gridstack.jQueryUI.js"></script>
-->
<script src="../dist/gridstack.all.js"></script>
</head>
<body>
<div class="container-fluid">
Expand Down
2 changes: 2 additions & 0 deletions demo/demo.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
/* required file for gridstack to work */
@import "../dist/gridstack.css";

/* Optional styles for demos */
.btn-primary {
color: #fff;
background-color: #007bff;
Expand Down
2 changes: 1 addition & 1 deletion demo/float.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<link rel="stylesheet" href="demo.css"/>

<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.4.1/jquery.min.js"></script>
<script src="../src/jquery-ui.min.js"></script>
<script src="../dist/jquery-ui.min.js"></script>
<script src="../src/gridstack.js"></script>
<script src="../src/gridstack.jQueryUI.js"></script>
</style>
Expand Down
2 changes: 1 addition & 1 deletion demo/knockout.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.4.1/jquery.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/knockout/3.5.0/knockout-debug.js"></script>
<script src="../src/jquery-ui.min.js"></script>
<script src="../dist/jquery-ui.min.js"></script>
<script src="../src/gridstack.js"></script>
<script src="../src/gridstack.jQueryUI.js"></script>
</head>
Expand Down
2 changes: 1 addition & 1 deletion demo/knockout2.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.4.1/jquery.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/knockout/3.5.0/knockout-min.js"></script>
<script src="../src/jquery-ui.min.js"></script>
<script src="../dist/jquery-ui.min.js"></script>
<script src="../src/gridstack.js"></script>
<script src="../src/gridstack.jQueryUI.js"></script>
</head>
Expand Down
2 changes: 1 addition & 1 deletion demo/nested.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<link rel="stylesheet" href="demo.css"/>

<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.4.1/jquery.min.js"></script>
<script src="../src/jquery-ui.min.js"></script>
<script src="../dist/jquery-ui.min.js"></script>
<script src="../src/gridstack.js"></script>
<script src="../src/gridstack.jQueryUI.js"></script>

Expand Down
2 changes: 1 addition & 1 deletion demo/responsive.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<link rel="stylesheet" href="../dist/gridstack-extra.css"/>

<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.4.1/jquery.min.js"></script>
<script src="../src/jquery-ui.min.js"></script>
<script src="../dist/jquery-ui.min.js"></script>
<script src="../src/gridstack.js"></script>
<script src="../src/gridstack.jQueryUI.js"></script>
</head>
Expand Down
2 changes: 1 addition & 1 deletion demo/right-to-left(rtl).html
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.4.1/jquery.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/knockout/3.5.0/knockout-min.js"></script>
<script src="../src/jquery-ui.min.js"></script>
<script src="../dist/jquery-ui.min.js"></script>
<script src="../src/gridstack.js"></script>
<script src="../src/gridstack.jQueryUI.js"></script>
</head>
Expand Down
2 changes: 1 addition & 1 deletion demo/serialization.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<link rel="stylesheet" href="demo.css"/>

<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.4.1/jquery.min.js"></script>
<script src="../src/jquery-ui.min.js"></script>
<script src="../dist/jquery-ui.min.js"></script>
<script src="../src/gridstack.js"></script>
<script src="../src/gridstack.jQueryUI.js"></script>
</head>
Expand Down
2 changes: 1 addition & 1 deletion demo/two.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<link rel="stylesheet" href="../dist/gridstack-extra.css"/>

<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.4.1/jquery.min.js"></script>
<script src="../src/jquery-ui.min.js"></script>
<script src="../dist/jquery-ui.min.js"></script>
<script src="../src/gridstack.js"></script>
<script src="../src/gridstack.jQueryUI.js"></script>

Expand Down
7 changes: 4 additions & 3 deletions doc/CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Change log
<!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->
**Table of Contents** *generated with [DocToc](http://doctoc.herokuapp.com/)*

- [v0.5.4-dev (upcoming changes)](#v054-dev-upcoming-changes)
- [v0.5.5 (2019-11-27)](#v055-2019-11-27)
- [v0.5.4 (2019-11-26)](#v054-2019-11-26)
- [v0.5.3 (2019-11-20)](#v053-2019-11-20)
- [v0.5.2 (2019-11-13)](#v052-2019-11-13)
Expand All @@ -24,10 +24,11 @@ Change log

<!-- END doctoc generated TOC please keep comment here to allow auto update -->

## v0.5.4-dev (upcoming changes)
## v0.5.5 (2019-11-27)

- min files include rev number/license [#1075](https://github.com/gridstack/gridstack.js/pull/1075)
- npm package fix to exclude more temporary content
- npm package fix to exclude more temporary content [#1078](https://github.com/gridstack/gridstack.js/pull/1078)
- removed `jquery-ui/*` requirements from AMD packing in `gridstack.jQueryUI.js` as it was causing App compile missing errors now that we include a subset of jquery-ui

## v0.5.4 (2019-11-26)

Expand Down
2 changes: 1 addition & 1 deletion karma.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ module.exports = function(config) {
'node_modules/jquery/dist/jquery.min.js',
'node_modules/core-js/client/shim.min.js',
'src/gridstack.js',
'src/jquery-ui.min.js',
'dist/jquery-ui.min.js',
'src/gridstack.jQueryUI.js',
'spec/*-spec.js',
// 'spec/e2e/*-spec.js' issues with ReferenceError: `browser` & `element` is not defined
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "gridstack",
"version": "0.5.4-dev",
"version": "0.5.5",
"description": "gridstack.js is a jQuery plugin for widget layout",
"main": "dist/gridstack.js",
"repository": {
Expand Down
2 changes: 1 addition & 1 deletion spec/e2e/html/1017-items-no-x-y-for-autoPosition.html
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<link rel="stylesheet" href="../../../demo/demo.css"/>

<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.4.1/jquery.min.js"></script>
<script src="../../../src/jquery-ui.min.js"></script>
<script src="../../../dist/jquery-ui.min.js"></script>
<script src="../../../src/gridstack.js"></script>
<script src="../../../src/gridstack.jQueryUI.js"></script>

Expand Down
2 changes: 1 addition & 1 deletion spec/e2e/html/810-many-columns.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<link rel="stylesheet" href="810-many-columns.css"/>

<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.4.1/jquery.min.js"></script>
<script src="../../../src/jquery-ui.min.js"></script>
<script src="../../../dist/jquery-ui.min.js"></script>
<script src="../../../src/gridstack.js"></script>
<script src="../../../src/gridstack.jQueryUI.js"></script>
</head>
Expand Down
2 changes: 1 addition & 1 deletion spec/e2e/html/column.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<link rel="stylesheet" href="../../../dist/gridstack-extra.css"/>

<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.4.1/jquery.min.js"></script>
<script src="../../../src/jquery-ui.min.js"></script>
<script src="../../../dist/jquery-ui.min.js"></script>
<script src="../../../src/gridstack.js"></script>
<script src="../../../src/gridstack.jQueryUI.js"></script>
</head>
Expand Down
2 changes: 1 addition & 1 deletion spec/e2e/html/gridstack-with-height.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<link rel="stylesheet" href="../../../demo/demo.css"/>

<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.4.1/jquery.min.js"></script>
<script src="../../../src/jquery-ui.min.js"></script>
<script src="../../../dist/jquery-ui.min.js"></script>
<script src="../../../dist/gridstack.js"></script>
<script src="../../../dist/gridstack.jQueryUI.js"></script>
</head>
Expand Down
2 changes: 1 addition & 1 deletion src/gridstack-poly.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/** gridstack.js 0.5.4-dev - IE and older browsers Polyfills for this library @preserve*/
/** gridstack.js 0.5.5 - IE and older browsers Polyfills for this library @preserve*/
/**
* https://gridstackjs.com/
* (c) 2019 Alain Dumesny
Expand Down
2 changes: 1 addition & 1 deletion src/gridstack.d.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Type definitions for Gridstack 0.5.4-dev
// Type definitions for Gridstack 0.5.5
// Project: https://gridstackjs.com/
// Definitions by: Pascal Senn <https://github.com/PascalSenn>
// Ricky Blankenaufulland <https://github.com/ZoolWay>
Expand Down
9 changes: 2 additions & 7 deletions src/gridstack.jQueryUI.js
Original file line number Diff line number Diff line change
@@ -1,17 +1,12 @@
/** gridstack.js 0.5.4-dev - JQuery UI Drag&Drop plugin @preserve */
/** gridstack.js 0.5.5 - JQuery UI Drag&Drop plugin @preserve */
/**
* https://gridstackjs.com/
* (c) 2014-2019 Dylan Weiss, Alain Dumesny, Pavel Reznikov
* gridstack.js may be freely distributed under the MIT license.
*/
(function(factory) {
if (typeof define === 'function' && define.amd) {
define(['jquery', 'gridstack', 'exports', 'jquery-ui/data', 'jquery-ui/disable-selection',
'jquery-ui/focusable', 'jquery-ui/form', 'jquery-ui/ie', 'jquery-ui/keycode', 'jquery-ui/labels',
'jquery-ui/jquery-1-7', 'jquery-ui/plugin', 'jquery-ui/safe-active-element', 'jquery-ui/safe-blur',
'jquery-ui/scroll-parent', 'jquery-ui/tabbable', 'jquery-ui/unique-id', 'jquery-ui/version',
'jquery-ui/widget', 'jquery-ui/widgets/mouse', 'jquery-ui/widgets/draggable',
'jquery-ui/widgets/droppable', 'jquery-ui/widgets/resizable'], factory);
define(['jquery', 'gridstack', 'exports'], factory);
} else if (typeof exports !== 'undefined') {
try { jQuery = require('jquery'); } catch (e) {}
try { gridstack = require('gridstack'); } catch (e) {}
Expand Down
2 changes: 1 addition & 1 deletion src/gridstack.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* gridstack.js 0.5.4-dev
* gridstack.js 0.5.5
* https://gridstackjs.com/
* (c) 2014-2019 Dylan Weiss, Alain Dumesny, Pavel Reznikov
* gridstack.js may be freely distributed under the MIT license.
Expand Down
2 changes: 1 addition & 1 deletion src/gridstack.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* required gridstack CSS for default column size
* required gridstack CSS for default 12 column size
* https://gridstackjs.com/
* (c) 2014-2019 Dylan Weiss, Alain Dumesny, Pavel Reznikov
* gridstack.js may be freely distributed under the MIT license.
Expand Down
7 changes: 0 additions & 7 deletions src/jquery-ui.min.js

This file was deleted.