This repository has been archived by the owner on Sep 3, 2019. It is now read-only.
forked from ManifestWebDesign/angular-gridster
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix issue for max row size being 9999 pixels (angular-gridster origin…
…al issue ManifestWebDesign#489) ManifestWebDesign#489
- Loading branch information
1 parent
fd0e107
commit 1964a82
Showing
6 changed files
with
8,946 additions
and
2,161 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,152 +1,152 @@ | ||
| angular.module('app') | ||
|
|
||
| .controller('DashboardCtrl', ['$scope', '$timeout', | ||
| function($scope, $timeout) { | ||
| $scope.gridsterOptions = { | ||
| margins: [20, 20], | ||
| columns: 4, | ||
| draggable: { | ||
| handle: 'h3' | ||
| } | ||
| }; | ||
|
|
||
| $scope.dashboards = { | ||
| '1': { | ||
| id: '1', | ||
| name: 'Home', | ||
| widgets: [{ | ||
| col: 0, | ||
| row: 0, | ||
| sizeY: 1, | ||
| sizeX: 1, | ||
| name: "Widget 1" | ||
| }, { | ||
| col: 2, | ||
| row: 1, | ||
| sizeY: 1, | ||
| sizeX: 1, | ||
| name: "Widget 2" | ||
| }] | ||
| }, | ||
| '2': { | ||
| id: '2', | ||
| name: 'Other', | ||
| widgets: [{ | ||
| col: 1, | ||
| row: 1, | ||
| sizeY: 1, | ||
| sizeX: 2, | ||
| name: "Other Widget 1" | ||
| }, { | ||
| col: 1, | ||
| row: 3, | ||
| sizeY: 1, | ||
| sizeX: 1, | ||
| name: "Other Widget 2" | ||
| }] | ||
| } | ||
| }; | ||
| .controller('DashboardCtrl', ['$scope', '$timeout', | ||
| function($scope, $timeout) { | ||
| $scope.gridsterOptions = { | ||
| margins: [20, 20], | ||
| columns: 4, | ||
| draggable: { | ||
| handle: 'h3' | ||
| } | ||
| }; | ||
|
|
||
| $scope.dashboards = { | ||
| '1': { | ||
| id: '1', | ||
| name: 'Home', | ||
| widgets: [{ | ||
| col: 0, | ||
| row: 0, | ||
| sizeY: 1, | ||
| sizeX: 1, | ||
| name: "Widget 1" | ||
| }, { | ||
| col: 2, | ||
| row: 1, | ||
| sizeY: 1, | ||
| sizeX: 1, | ||
| name: "Widget 2" | ||
| }] | ||
| }, | ||
| '2': { | ||
| id: '2', | ||
| name: 'Other', | ||
| widgets: [{ | ||
| col: 1, | ||
| row: 1, | ||
| sizeY: 1, | ||
| sizeX: 2, | ||
| name: "Other Widget 1" | ||
| }, { | ||
| col: 1, | ||
| row: 3, | ||
| sizeY: 1, | ||
| sizeX: 1, | ||
| name: "Other Widget 2" | ||
| }] | ||
| } | ||
| }; | ||
|
|
||
| $scope.clear = function() { | ||
| $scope.dashboard.widgets = []; | ||
| }; | ||
| $scope.clear = function() { | ||
| $scope.dashboard.widgets = []; | ||
| }; | ||
|
|
||
| $scope.addWidget = function() { | ||
| $scope.dashboard.widgets.push({ | ||
| name: "New Widget", | ||
| sizeX: 1, | ||
| sizeY: 1 | ||
| $scope.addWidget = function() { | ||
| $scope.dashboard.widgets.push({ | ||
| name: "New Widget", | ||
| sizeX: 1, | ||
| sizeY: 1 | ||
| }); | ||
| }; | ||
|
|
||
| $scope.$watch('selectedDashboardId', function(newVal, oldVal) { | ||
| if (newVal !== oldVal) { | ||
| $scope.dashboard = $scope.dashboards[newVal]; | ||
| } else { | ||
| $scope.dashboard = $scope.dashboards[1]; | ||
| } | ||
| }); | ||
| }; | ||
|
|
||
| $scope.$watch('selectedDashboardId', function(newVal, oldVal) { | ||
| if (newVal !== oldVal) { | ||
| $scope.dashboard = $scope.dashboards[newVal]; | ||
| } else { | ||
| $scope.dashboard = $scope.dashboards[1]; | ||
| } | ||
| }); | ||
| // init dashboard | ||
| $scope.selectedDashboardId = '1'; | ||
|
|
||
| // init dashboard | ||
| $scope.selectedDashboardId = '1'; | ||
| } | ||
| ]) | ||
|
|
||
| .controller('CustomWidgetCtrl', ['$scope', '$modal', | ||
| function($scope, $modal) { | ||
|
|
||
| $scope.remove = function(widget) { | ||
| $scope.dashboard.widgets.splice($scope.dashboard.widgets.indexOf(widget), 1); | ||
| }; | ||
|
|
||
| $scope.openSettings = function(widget) { | ||
| $modal.open({ | ||
| scope: $scope, | ||
| templateUrl: 'demo/dashboard/widget_settings.html', | ||
| controller: 'WidgetSettingsCtrl', | ||
| resolve: { | ||
| widget: function() { | ||
| return widget; | ||
| } | ||
| } | ||
| }); | ||
| }; | ||
|
|
||
| } | ||
| ]) | ||
| } | ||
| ]) | ||
|
|
||
| .controller('CustomWidgetCtrl', ['$scope', '$modal', | ||
| function($scope, $modal) { | ||
| .controller('WidgetSettingsCtrl', ['$scope', '$timeout', '$rootScope', '$modalInstance', 'widget', | ||
| function($scope, $timeout, $rootScope, $modalInstance, widget) { | ||
| $scope.widget = widget; | ||
|
|
||
| $scope.remove = function(widget) { | ||
| $scope.dashboard.widgets.splice($scope.dashboard.widgets.indexOf(widget), 1); | ||
| }; | ||
| $scope.form = { | ||
| name: widget.name, | ||
| sizeX: widget.sizeX, | ||
| sizeY: widget.sizeY, | ||
| col: widget.col, | ||
| row: widget.row | ||
| }; | ||
|
|
||
| $scope.openSettings = function(widget) { | ||
| $modal.open({ | ||
| scope: $scope, | ||
| templateUrl: 'demo/dashboard/widget_settings.html', | ||
| controller: 'WidgetSettingsCtrl', | ||
| resolve: { | ||
| widget: function() { | ||
| return widget; | ||
| } | ||
| } | ||
| }); | ||
| }; | ||
|
|
||
| } | ||
| ]) | ||
|
|
||
| .controller('WidgetSettingsCtrl', ['$scope', '$timeout', '$rootScope', '$modalInstance', 'widget', | ||
| function($scope, $timeout, $rootScope, $modalInstance, widget) { | ||
| $scope.widget = widget; | ||
|
|
||
| $scope.form = { | ||
| name: widget.name, | ||
| sizeX: widget.sizeX, | ||
| sizeY: widget.sizeY, | ||
| col: widget.col, | ||
| row: widget.row | ||
| }; | ||
|
|
||
| $scope.sizeOptions = [{ | ||
| id: '1', | ||
| name: '1' | ||
| }, { | ||
| id: '2', | ||
| name: '2' | ||
| }, { | ||
| id: '3', | ||
| name: '3' | ||
| }, { | ||
| id: '4', | ||
| name: '4' | ||
| }]; | ||
|
|
||
| $scope.dismiss = function() { | ||
| $modalInstance.dismiss(); | ||
| }; | ||
|
|
||
| $scope.remove = function() { | ||
| $scope.dashboard.widgets.splice($scope.dashboard.widgets.indexOf(widget), 1); | ||
| $modalInstance.close(); | ||
| }; | ||
|
|
||
| $scope.submit = function() { | ||
| angular.extend(widget, $scope.form); | ||
|
|
||
| $modalInstance.close(widget); | ||
| }; | ||
|
|
||
| } | ||
| ]) | ||
|
|
||
| // helper code | ||
| .filter('object2Array', function() { | ||
| return function(input) { | ||
| var out = []; | ||
| for (i in input) { | ||
| out.push(input[i]); | ||
| $scope.sizeOptions = [{ | ||
| id: '1', | ||
| name: '1' | ||
| }, { | ||
| id: '2', | ||
| name: '2' | ||
| }, { | ||
| id: '3', | ||
| name: '3' | ||
| }, { | ||
| id: '4', | ||
| name: '4' | ||
| }]; | ||
|
|
||
| $scope.dismiss = function() { | ||
| $modalInstance.dismiss(); | ||
| }; | ||
|
|
||
| $scope.remove = function() { | ||
| $scope.dashboard.widgets.splice($scope.dashboard.widgets.indexOf(widget), 1); | ||
| $modalInstance.close(); | ||
| }; | ||
|
|
||
| $scope.submit = function() { | ||
| angular.extend(widget, $scope.form); | ||
|
|
||
| $modalInstance.close(widget); | ||
| }; | ||
|
|
||
| } | ||
| ]) | ||
|
|
||
| // helper code | ||
| .filter('object2Array', function() { | ||
| return function(input) { | ||
| var out = []; | ||
| for (i in input) { | ||
| out.push(input[i]); | ||
| } | ||
| return out; | ||
| } | ||
| return out; | ||
| } | ||
| }); | ||
| }); |
Oops, something went wrong.