Merge branch 'develop' of https://github.com/CherryFramework/cherry-f…

…ramework into develop
CherryFramework · Oct 6, 2016 · 886c598 · 886c598
2 parents 16df51b + aa4a6a5
commit 886c598
Show file tree

Hide file tree

Showing 14 changed files with 578 additions and 664 deletions.
diff --git a/config.json b/config.json
@@ -82,17 +82,6 @@
 			"required" : false,
 			"dependencies" : []
 		},
-		"cherry-page-builder" : {
-			"name" : "Page Builder",
-			"description" : "Provides functionality for building custom options pages.",
-			"version" : "1.1.1",
-			"doc_link" : "",
-			"git_link" : "https://github.com/CherryFramework/cherry-framework/tree/master/modules/cherry-page-builder",
-			"compatible" : ["plugin"],
-			"wordpress_org" : true,
-			"required" : false,
-			"dependencies" : []
-		},
 		"cherry-plugin-updater" : {
 			"name" : "Plugin Updater",
 			"description" : "Provides functionality for updating plugins.",

diff --git a/modules/cherry-handler/assets/js/cherry-handler.js b/modules/cherry-handler/assets/js/cherry-handler.js
@@ -283,6 +283,4 @@
 			return json;
 		}
 	};
-
-	$( document ).trigger( 'CherryHandlerInit' );
 }( jQuery, window.CherryJsCore ) );
diff --git a/modules/cherry-handler/assets/js/min/cherry-handler.min.js b/modules/cherry-handler/assets/js/min/cherry-handler.min.js
diff --git a/modules/cherry-page-builder/assets/css/min/page-settings.min.css b/modules/cherry-page-builder/assets/css/min/page-settings.min.css
diff --git a/modules/cherry-page-builder/assets/js/min/page-settings.min.js b/modules/cherry-page-builder/assets/js/min/page-settings.min.js
diff --git a/modules/cherry-page-builder/assets/js/page-settings.js b/modules/cherry-page-builder/assets/js/page-settings.js
diff --git a/modules/cherry-page-builder/assets/scss/page-setting.scss b/modules/cherry-page-builder/assets/scss/page-setting.scss