Merge pull request #67 from ahmadfh/master

remove settings page
BuildFire · Apr 11, 2017 · 13b29af · 13b29af
2 parents 52b804b + ebefc80
commit 13b29af
Show file tree

Hide file tree

Showing 14 changed files with 14 additions and 270 deletions.
diff --git a/control/settings/app.js b/control/settings/app.js
diff --git a/control/settings/assets/lib/input-tags/css/ng-tags-input.bootstrap.min.css b/control/settings/assets/lib/input-tags/css/ng-tags-input.bootstrap.min.css
diff --git a/control/settings/assets/lib/input-tags/css/ng-tags-input.min.css b/control/settings/assets/lib/input-tags/css/ng-tags-input.min.css
diff --git a/control/settings/assets/lib/input-tags/js/ng-tags-input.min.js b/control/settings/assets/lib/input-tags/js/ng-tags-input.min.js
diff --git a/control/settings/controllers/mainSettingsCtrl.js b/control/settings/controllers/mainSettingsCtrl.js
diff --git a/control/settings/index.html b/control/settings/index.html
@@ -1,30 +1,23 @@
 <!DOCTYPE html>
-<html ng-app="socialPluginSettings">
+<html>
 <head>
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
     <!-- Load helper.css to use our helper classes.
-    -->
     <link href="../../../../styles/helper.css" rel="stylesheet">
-    <!-- input tags -->
-    <link href="assets/lib/input-tags/css/ng-tags-input.min.css" rel="stylesheet">
-    <link href="assets/lib/input-tags/css/ng-tags-input.bootstrap.min.css" rel="stylesheet">
+    -->
 
     <!-- JS -->
     <script src="../../../../scripts/buildfire.js"></script>
-    <script src="../../../../scripts/angular/angular.min.js"></script>
-    <script src="../../../../scripts/angular/angular-route.min.js"></script>
-    <!-- input tags -->
-    <script src="assets/lib/input-tags/js/ng-tags-input.min.js"></script>
-    <script src="app.js"></script>
-    <script src="controllers/mainSettingsCtrl.js"></script>
 
-    <script src="../../../../scripts/angular/ui-bootstrap.min.js"></script>
     <!--
-        <script src="../../../../scripts/jquery/jquery-1.11.2.min.js"></script>
-        -->
+   <script src="../../../../scripts/angular/angular.min.js"></script>
+   <script src="../../../../scripts/angular/ui-bootstrap.min.js"></script>
+
+   <script src="../../../../scripts/jquery/jquery-1.11.2.min.js"></script>
+   -->
 </head>
-<body class="scrollable">
-<div class="settings" ng-view></div>
+<body>
+<span>Settings - Hello world!</span>
 </body>
 </html>
diff --git a/control/settings/views/mainSettings.html b/control/settings/views/mainSettings.html
diff --git a/plugin.json b/plugin.json
@@ -13,7 +13,7 @@
       "enabled": false
     },
     "settings": {
-      "enabled": true
+      "enabled": false
     }
   },
   "widget": {

diff --git a/test/control/settings/app.specs.js b/test/control/settings/app.specs.js
diff --git a/test/control/settings/controller/settings.mainSettings.controller.specs.js b/test/control/settings/controller/settings.mainSettings.controller.specs.js
diff --git a/widget/controllers/widget.thread.controller.js b/widget/controllers/widget.thread.controller.js
@@ -13,7 +13,6 @@
             Thread.buildfire = Buildfire;
             Thread.SocialItems = SocialItems.getInstance();
             Thread.SocialItems.comments = [];
-            Thread.createThreadPermission = false;
             Thread.imageSelected = false;
             Thread.imageName = '';
             Thread.post = {};
@@ -25,41 +24,6 @@
                 return (typeof _receivePushNotification !== 'undefined') ? (_receivePushNotification ? THREAD_STATUS.FOLLOWING : THREAD_STATUS.FOLLOW) : '';
             };
 
-            Thread.showHideCommentBox = function () {
-                if (Thread.SocialItems &&
-                    Thread.SocialItems.appSettings &&
-                    Thread.SocialItems.appSettings.allowSideThreadTags &&
-                    Thread.SocialItems.appSettings.sideThreadUserTags &&
-                    Thread.SocialItems.appSettings.sideThreadUserTags.length > 0
-                ) {
-                    var _userTagsObj = Thread.userDetails.userTags;
-                    var _userTags = [];
-                    if (_userTagsObj) {
-                        _userTags = _userTagsObj[Object.keys(_userTagsObj)[0]];
-                    }
-
-                    if (_userTags) {
-                        var _hasPermission = false;
-                        for (var i = 0; i < Thread.SocialItems.appSettings.sideThreadUserTags.length; i++) {
-                            var _sideThreadTag = Thread.SocialItems.appSettings.sideThreadUserTags[i].text;
-                            for (var x = 0; x < _userTags.length; x++) {
-                                if (_sideThreadTag.toLowerCase() == _userTags[x].tagName.toLowerCase()) {
-                                    _hasPermission = true;
-                                    break;
-                                }
-                            }
-                        }
-                        Thread.createThreadPermission = _hasPermission;
-                    } else {
-                        Thread.createThreadPermission = false;
-                    }
-                } else {
-                    Thread.createThreadPermission = true;
-                }
-
-                $scope.$digest();
-            };
-
             var getUserData = function (userId) {
                 if(userId){
                     if (userIds.indexOf(userId.toString()) == -1) {
@@ -172,7 +136,6 @@
                                         console.error('Side Thread Get Social settings', err);
                                     } else {
                                         Thread.SocialItems.appSettings = SocialData && SocialData.data && SocialData.data.appSettings;
-                                        Thread.showHideCommentBox();
                                         deferred.resolve();
                                         SocialDataStore.getUserSettings({
                                             threadId: Thread.post._id,
@@ -811,8 +774,6 @@
                     Thread.userDetails.userToken = user.userToken;
                     Thread.userDetails.userId = user._id;
                     getUserData(user._id);
-                    //check user if has permission to create thread
-                    Thread.showHideCommentBox();
                     $scope.$digest();
                 }
             });