Skip to content
This repository has been archived by the owner on Jun 22, 2022. It is now read-only.

Calling SS_Object instead of Object #12

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
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
20 changes: 10 additions & 10 deletions _config.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,18 @@

define('FRONTEND_ADMIN_DIR', basename(dirname(__FILE__)));

Object::useCustomClass('Boolean', 'FrontEndBoolean', true);
Object::useCustomClass('Enum', 'FrontEndEnum', true);
//Object::useCustomClass('Image', 'FrontEndImage', true);
Object::useCustomClass('HTMLText', 'FrontendEditorHTMLText', true);
Object::useCustomClass('Text', 'FrontendEditorText', true);
Object::useCustomClass('Varchar', 'FrontendEditorVarchar', true);
SS_Object::useCustomClass('Boolean', 'FrontEndBoolean', true);
SS_Object::useCustomClass('Enum', 'FrontEndEnum', true);
//SS_Object::useCustomClass('Image', 'FrontEndImage', true);
SS_Object::useCustomClass('HTMLText', 'FrontendEditorHTMLText', true);
SS_Object::useCustomClass('Text', 'FrontendEditorText', true);
SS_Object::useCustomClass('Varchar', 'FrontendEditorVarchar', true);

//Image::add_extension('FrontEndImageExtension');

Object::add_extension('Page_Controller', 'FrontendEditingControllerExtension');
Object::add_extension('Page', 'FrontendAdminPageExtension');
SS_Object::add_extension('Page_Controller', 'FrontendEditingControllerExtension');
SS_Object::add_extension('Page', 'FrontendAdminPageExtension');

if (class_exists("DynamicCacheExtension")) {
Object::add_extension('DynamicCache', 'FrontEndAdminDynamicCacheExtension');
}
SS_Object::add_extension('DynamicCache', 'FrontEndAdminDynamicCacheExtension');
}
6 changes: 3 additions & 3 deletions code/extensions/FrontendEditingControllerExtension.php
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ public function onBeforeInit()

if ($canEdit) {
// Enable front-end fly-out menu
//
//
//Flexslider imports easing, which breaks?
Requirements::block('flexslider/javascript/jquery.easing.1.3.js');

Expand Down Expand Up @@ -148,7 +148,7 @@ public function feFileUploadForm(SS_HTTPRequest $request)
}
}

class FrontEndEditItem extends Object
class FrontEndEditItem extends SS_Object
{
public $class;
public $field;
Expand Down Expand Up @@ -253,4 +253,4 @@ public function saveValue()
}
return $result;
}
}
}